aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/main.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a1468ba..cc54242 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,7 @@ defaults.cc: force
59 echo '}'; \ 59 echo '}'; \
60 echo ''; \ 60 echo ''; \
61 echo 'const char* svnversion(void) {'; \ 61 echo 'const char* svnversion(void) {'; \
62 echo ' return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";';\ 62 echo ' return "'`cat ../.git/refs/heads/master`'";';\
63 echo '}' ) > defaults_tmp.cc 63 echo '}' ) > defaults_tmp.cc
64 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi 64 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
65 @rm defaults_tmp.cc 65 @rm defaults_tmp.cc
diff --git a/src/main.cc b/src/main.cc
index ab18f6c..677ed0e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -75,7 +75,7 @@ static void showInfo(ostream &ostr) {
75 ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl; 75 ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl;
76 76
77 if (strlen(svnversion()) > 0) 77 if (strlen(svnversion()) > 0)
78 ostr << _FB_CONSOLETEXT(Common, SvnRevision, "SVN Revision", "Revision number in SVN repositary") << ": " << svnversion() << endl; 78 ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << svnversion() << endl;
79#if defined(__DATE__) && defined(__TIME__) 79#if defined(__DATE__) && defined(__TIME__)
80 ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl; 80 ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl;
81#endif 81#endif