summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-02 12:29:31 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-02 12:29:31 -0400
commit9b758456f806e9813e2b7b91d7596c63b63f55ae (patch)
tree0d0c9607e0e3e7f0028207ac638eac6b02bf07d0 /Makefile
parent83066659cc06d097057dd08d09d674cdcdac8b52 (diff)
parentc61fa90d6566fda54f6bf7b092e397ddf000809f (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions