summaryrefslogtreecommitdiff
path: root/git/merge.sh
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-04-22 15:28:58 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-04-22 17:52:55 +0200
commit3699a90b49d8e8fe873543a893710856cb3e3658 (patch)
tree59bc40be4d6d03ccc1b16e56ef44bc68a17ef860 /git/merge.sh
parent851daff69fc6487d6cba853d2c0db802031c660b (diff)
Script updates to include libodb-qt
Diffstat (limited to 'git/merge.sh')
0 files changed, 0 insertions, 0 deletions