I hate ChangeLog conflicts

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4790 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index f82b359698b3928b9ac856e726499e7ea08bd4ff..8358003fd3d18494c839f16e9da0d0747732bbf9 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  John Levon  <levon@movementarian.org>
+
+       * lyx_gui.C:
+       * XWorkArea.C: using dec 
+
 2002-07-25  Juergen Spitzmueller <j.spitzmueller@gmx.de>
 
        * FormFloat.C: Fixed and better GUI-logic

diff --git a/src/frontends/xforms/XWorkArea.C b/src/frontends/xforms/XWorkArea.C
index 56d9fc7d3af1c32e1b74054baf86a6a7f55264ab..1cd6e638976cf24031d31606345f3240ad8f8939 100644 (file)
--- a/src/frontends/xforms/XWorkArea.C
+++ b/src/frontends/xforms/XWorkArea.C
@@ -37,6 +37,7 @@ FL_APPEVENT_CB fl_set_preemptive_callback(Window, FL_APPEVENT_CB, void *);
 using std::endl;
 using std::abs;
 using std::hex;
+using std::dec;
 
 namespace {
 

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index 6655518eb2f1740a862895f94f0e17c38da395a3..01458e8e487c1bcb59909564df5e2daf1b728d40 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -50,6 +50,7 @@ using std::exit;
 
 using std::vector;
 using std::hex;
+using std::dec;
 using std::endl;
 using std::setbase;
 using std::setfill;