[Commit-gnuradio] gnuradio-core ChangeLog

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Eric Blossom <eb>       06/07/18 02:06:49

Modified files:
        .              : ChangeLog 

Log message:
        sorted out conflict markers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/ChangeLog?cvsroot=gnuradio&r1=1.244&r2=1.245

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- ChangeLog   7 Jul 2006 15:33:06 -0000       1.244
+++ ChangeLog   18 Jul 2006 02:06:49 -0000      1.245
@@ -3,14 +3,18 @@
        * src/python/gnuradio/blksimpl/gmsk2.py:
        Added AGC to GMSK code.
        
-
 2006-07-06  Tom Rondeau  <address@hidden>
 
        * src/python/gnuradio/blksimpl/Makefile.am: 
        Call to gmsk.py was causing error after removal of gmsk.py file.
        Removed call in Makefile.am to this.
 
-<<<<<<< ChangeLog
+2006-07-05  Eric Blossom  <address@hidden>
+
+       * src/python/gnuradio/blksimpl/gmsk.py: Removed long deprecated
+       code.  We'll give this a week or so for the dust to settle, then
+       we'll rename gmsk2.py to gmsk.py
+
 2006-06-29  Tom Rondeau  <address@hidden>
 
        * src/lib/general/gr_correlate_access_code_bb.cc (work): 
@@ -29,14 +33,6 @@
        * src/lib/general/gr_constellation_decoder_cb.cc: 
        Set Compute_EVN=false by default (to clean up the output)
 
-=======
-2006-07-05  Eric Blossom  <address@hidden>
-
-       * src/python/gnuradio/blksimpl/gmsk.py: Removed long deprecated
-       code.  We'll give this a week or so for the dust to settle, then
-       we'll rename gmsk2.py to gmsk.py
-
->>>>>>> 1.242
 2006-06-20  Tom Rondeau  <address@hidden>
 
        * src/lib/general/gr_costas_loop_cc.{h,cc,i}: modified to support