Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index ab0ee1b39a0ee55cee07cf1a473751a9076e8f6d..883c5e247584b116825cbdfc4174f9e36ff42a25 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 463 // jrioux: encodings renaming
-#define LYX_FORMAT_TEX2LYX 463 // jrioux: encodings renaming
+#define LYX_FORMAT_LYX 510 // gb: date inset
+#define LYX_FORMAT_TEX2LYX 510
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER