summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-11 15:00:00 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-11 15:00:00 -0400
commit9803d8bb635132458142416d32273c9c754b2aca (patch)
tree719f0268a49da786133736e83072f228ec48be43 /Makefile
parent7d62553b8bdaeafaf46c65f385933b47657dd023 (diff)
parentff3cc0c92fc865297ed869b38c6cb0dd0882f77c (diff)
Merge branch 'master' into buildsystems
Conflicts: dh_auto_configure
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions