From: John Levon <levon@movementarian.org>
Date: Thu, 25 Jul 2002 18:15:33 +0000 (+0000)
Subject: I hate ChangeLog conflicts
X-Git-Tag: 1.6.10~18745
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d088ebfbae500bef1f726599253e2f7b4de30507;p=features.git

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 f82b359698..8358003fd3 100644
--- 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 56d9fc7d3a..1cd6e63897 100644
--- 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 6655518eb2..01458e8e48 100644
--- 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;