[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 254871ab525d1ef35fcb3d4672ab258927a8dbc1
Merge: 265e729 3d18f70
Author: Tom Rondeau <address@hidden>
Date:   Thu Jul 31 14:15:12 2014 -0400

    Merge branch 'maint'
    
    Conflicts:
        gr-uhd/lib/usrp_sink_impl.cc

 gr-uhd/lib/usrp_sink_impl.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --cc gr-uhd/lib/usrp_sink_impl.cc
index cdbe7b5,f05d90e..20f6fd6
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@@ -635,11 -605,8 +635,8 @@@ namespace gr 
          if (my_tag_count >= max_count) {
            break;
          }
-         else if (not pmt::is_null(_length_tag_key) and my_tag_count > 
samp0_count + _nitems_to_send) {
-           break;
-         }
  
 -        /* I. Bursts that can only be on the first sample of burst
 +        /* I. Tags that can only be on the first sample of a burst
           *
           * This includes:
           * - tx_time