The big change tracking patch. Changes from posted version :

[features.git] / src / frontends / controllers / ChangeLog

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 41907bffd5a1d03797f0dd20c088b4781e1a12f0..e9bae13ade20444f8924096b6296220ea286af20 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-08  John Levon  <levon@movementarian.org>
+
+       * Makefile.am:
+       * ControlChanges.h:
+       * ControlChanges.C: add merge changes dialog
+
+       * ControlPrefs.h:
+       * ControlPrefs.C: add setCurrentAuthor()
+
 2003-01-31  Angus Leeming  <leeming@lyx.org>
 
        * ViewBase.h: add an isVisible() pure virtual method.