Merge branch 'obi/master' into experimental

diff --git a/main/Makefile.am b/main/Makefile.am
index 78fcc6c..0ad1ae9 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -16,7 +16,7 @@ enigma2_SOURCES = \
        xmlgenerator.cpp \
        xmlgenerator.h \
        version_info.cpp \
-       version_info.h
+       version_info.h \
        version.h
 
 EXTRA_DIST = \
@@ -60,7 +60,7 @@ if HAVE_FAKE_GIT_DIR
 ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4`
 ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch`
 else
-ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --format=format:%cd --date=short`
+ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short`
 ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
 ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --dirty --long --tags`
 endif

diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644 (file)
index 0000000..fcadf30
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1 @@
+enigma2.sh