Allow semantic colors in branches and use semantic background color by default

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 7b3113197b2af15d6a792eae8af97555ee9147c4..b4a855e2b38fea1bcf6864ec4bd2e81c5d609a42 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 600 // spitz: hungarian quote style
-#define LYX_FORMAT_TEX2LYX 600
+#define LYX_FORMAT_LYX 602 // spitz: semantic branch colors
+#define LYX_FORMAT_TEX2LYX 602
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER