summaryrefslogtreecommitdiff
path: root/git/merge.sh
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-04-22 17:29:42 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-04-22 17:52:55 +0200
commit0f40780ed42bcd2cb8b4da5ad936246132cc69a0 (patch)
treeb2a314f73b8c15a1baa63bad3646b667e2182917 /git/merge.sh
parent3699a90b49d8e8fe873543a893710856cb3e3658 (diff)
Update build-dist script to include libodb-qt
Diffstat (limited to 'git/merge.sh')
0 files changed, 0 insertions, 0 deletions