Merge branch 'master' of git://git.opendreambox.org/git/enigma2
authorpieterg <pieterg@users.sourceforge.net>
Wed, 25 Nov 2009 09:02:43 +0000 (10:02 +0100)
committerpieterg <pieterg@users.sourceforge.net>
Wed, 25 Nov 2009 09:02:43 +0000 (10:02 +0100)
Conflicts:
lib/python/Components/About.py: reverted to 'ours'
main/enigma.cpp: reverted to 'theirs' but prepended 'OpenPLi' to the version string

1  2 
lib/python/Components/config.py
main/Makefile.am
main/enigma.cpp

Simple merge
Simple merge
diff --cc main/enigma.cpp
@@@ -309,14 -309,21 +309,21 @@@ void quitMainloop(int exitCode
  
  const char *getEnigmaVersionString()
  {
-       return 
- #ifdef ENIGMA2_CHECKOUT_TAG
-               ENIGMA2_CHECKOUT_TAG
+       std::string date =
+ #ifdef ENIGMA2_LAST_CHANGE_DATE
+               ENIGMA2_LAST_CHANGE_DATE;
  #else
-               "PLi"
+               __DATE__;
  #endif
-                       " - " __DATE__;
+       std::string branch =
+ #ifdef ENIGMA2_BRANCH
+               ENIGMA2_BRANCH;
+ #else
+               "HEAD";
+ #endif
 -      return std::string(date + '-' + branch).c_str();
++      return std::string("OpenPLi " + date + '-' + branch).c_str();
  }
  #include <malloc.h>
  
  void dump_malloc_stats(void)