projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 2a2714a830ab47b1ec5b2f1ddd289e024e0e14a2..2de55a4e53d280cdbe06df2ffa67c4c25877d8dc 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-1388,24
+1388,16
@@
/* program information and versioning definitions */
/* program information and versioning definitions */
-#define RELEASE_31
1
TRUE
+#define RELEASE_31
2
TRUE
-#if RELEASE_311
#define PROGRAM_VERSION_MAJOR 3
#define PROGRAM_VERSION_MINOR 1
#define PROGRAM_VERSION_MAJOR 3
#define PROGRAM_VERSION_MINOR 1
-#define PROGRAM_VERSION_PATCH
1
+#define PROGRAM_VERSION_PATCH
2
#define PROGRAM_VERSION_BUILD 0
#define PROGRAM_VERSION_BUILD 0
-#else
-/* !!! make sure that packaging script can find unique version number !!! */
-#define X_PROGRAM_VERSION_MAJOR 3
-#define X_PROGRAM_VERSION_MINOR 2
-#define X_PROGRAM_VERSION_PATCH 0
-#define X_PROGRAM_VERSION_BUILD 3
-#endif
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
-#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-200
5
by Holger Schemel"
+#define PROGRAM_COPYRIGHT_STRING "Copyright ©1995-200
6
by Holger Schemel"
#define ICON_TITLE_STRING PROGRAM_TITLE_STRING
#define COOKIE_PREFIX "ROCKSNDIAMONDS"
#define ICON_TITLE_STRING PROGRAM_TITLE_STRING
#define COOKIE_PREFIX "ROCKSNDIAMONDS"