diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /wscript | |
parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) |
fix merge conflicts with master
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -34,6 +34,7 @@ children = [ 'libs/ardour', 'libs/gtkmm2ext', 'libs/audiographer', + 'libs/plugins/reasonablesynth.lv2', 'gtk2_ardour', 'export', 'midi_maps', @@ -57,7 +58,7 @@ def fetch_gcc_version (CC): return version def fetch_git_revision (): - cmd = "git describe --tags HEAD" + cmd = "git describe HEAD" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() rev = output[0].decode('utf-8') return rev |