0

Merge branch 'master' into anvil

The "Anvil currently in development" message was left out of the merge.
This commit is contained in:
Aaron Griffith
2012-03-02 19:12:54 -05:00

View File

@@ -64,7 +64,7 @@ def findGitHash():
def findGitVersion(): def findGitVersion():
try: try:
p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE, shell=True) p = Popen('git describe --tags', stdout=PIPE, stderr=PIPE, shell=True)
p.stderr.close() p.stderr.close()
line = p.stdout.readlines()[0] line = p.stdout.readlines()[0]
if line.startswith('release-'): if line.startswith('release-'):