*** empty log message ***

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea3163b25ef..f86c68f21e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el: Add advice about using Cygwin GDB (from a
+        thread in [h-e-w]).
+
 2008-03-08  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
 
         * subr.el (while-no-input): Don't splice BODY directly into the
@@ -60,6 +65,7 @@
         * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
         doc-string, "c-old-LEN" -> "c-old-END".
 
+>>>>>>> 1.11049.2.667
 2008-02-29  Glenn Morris  <rgm@gnu.org>
 
         * allout.el (allout-topic-encryption-bullet)