summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-01 16:12:22 +0200
committerMichael Vogt <mvo@debian.org>2014-04-01 16:12:22 +0200
commitd13bb95849fd168200554972b4295c40933e2461 (patch)
tree6a5044088b4164c29a76edbf34b30dfb4b7f52d1 /Makefile
parent8a1c9010137a8c49d9808f2db34b9ee277138986 (diff)
parentc2d859fc8e2b2c74c3da5c722bd31b54d7020868 (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions