Move <QTimer> from TocWidget.h

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 04fe1ce4a487aa4ba55080edcae35a34e928ebee..f13766180b1ab0d0efb4914865b580dc1f6e209e 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 538 // uwestoehr: support for formula indentation
-#define LYX_FORMAT_TEX2LYX 538
+#define LYX_FORMAT_LYX 599 // sanda: nobreakpage
+#define LYX_FORMAT_TEX2LYX 599
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER