Merge branch 'master' into gtk3

2015-08-18 23:05:55 +02:00
parent 7a2e0c7b96 60ddd563b8
commit 956213df65
12 changed files with 177 additions and 161 deletions
--- a/rtgui/version.h.in
+++ b/rtgui/version.h.in
@@ -4,9 +4,9 @@
 #ifndef _VERSION_
 #define _VERSION_

-#define VERSION "${HG_VERSION}"
+#define VERSION "${GIT_VERSION}"
 #define VERSION_SUFFIX "${VERSION_SUFFIX}"
-#define TAGDISTANCE ${HG_TAGDISTANCE}
+#define TAGDISTANCE ${GIT_TAGDISTANCE}
 #define CACHEFOLDERNAME "RawTherapee${CACHE_NAME_SUFFIX}"

 #endif