I hate ChangeLog conflicts

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

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

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 {
 

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;