X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=0a3b4930085ff5bffbd4fe0cc78b5a76949e31d2;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=da997c741131bb6ee12aa97dfaf22c6e80afbde3;hpb=54c41ce26e5f87c34653d0ebe24d067fdfebf480;p=lyx.git

diff --git a/src/version.h b/src/version.h
index da997c7411..0a3b493008 100644
--- 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 437 // spitz: support for the TeXGyre fonts
-#define LYX_FORMAT_TEX2LYX 437 // spitz: support for the TeXGyre fonts
+#define LYX_FORMAT_LYX 511 // rgh: inverted branches
+#define LYX_FORMAT_TEX2LYX 511
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER