X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=1d65845488686b33bfa1773dc0c78b442ded4e63;hb=176315dffc4e2f9286eca4a828887dc50cc15225;hp=864b21214100ddb156dd0bb3192896a353fbdd01;hpb=2efcbb74d6257f50e4a32731629086bafeeb64b4;p=lyx.git

diff --git a/src/version.h b/src/version.h
index 864b212141..1d65845488 100644
--- a/src/version.h
+++ b/src/version.h
@@ -14,16 +14,19 @@
 
 //namespace lyx {
 
+///About dialog, inset info, export headers
+extern char const * const lyx_version;
+//.lyx header. We don't want lyx_version because of VCS conflicts.
+extern const int lyx_version_major;
+extern const int lyx_version_minor;
 ///
-extern char const * lyx_version;
-///
-extern char const * lyx_release_date;
+extern char const * const lyx_release_date;
 
 /// Package identifier (lyx[-<version-suffix>])
-extern char const * lyx_package;
+extern char const * const lyx_package;
 
 /// This is the version information shown by 'lyx -version'
-extern char const * lyx_version_info;
+extern char const * const lyx_version_info;
 
 //} // namespace lyx