Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 9fbc5e3fd3dc47e8bd9fb41f92833be5fb5d103f..757f43f3c1dfffe864a9c49a5b9636a8387cec92 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -20,6 +20,8 @@ extern char const * const lyx_version;
 extern const int lyx_version_major;
 extern const int lyx_version_minor;
 ///
+extern char const * const lyx_git_commit_hash;
+///
 extern char const * const lyx_release_date;
 
 /// Package identifier (lyx[-<version-suffix>])
@@ -30,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 441 // spitz: mathdesign tex font changes
-#define LYX_FORMAT_TEX2LYX 441 // spitz: mathdesign tex font changes
+#define LYX_FORMAT_LYX 508 // forenr: convert parbreak to latexpar
+#define LYX_FORMAT_TEX2LYX 508
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER