chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:55:07 +0000 (22:55 +0100)
committermartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:55:07 +0000 (22:55 +0100)
commited5f8376b25da3793b40ce660f3ab8eca9f0cb7f
treeee01ddd9e10f1d39ccd7db04a5cd5375f9b0c840
parent5aa8cf9d4fba8b6dbbd7878eb78b2600e3736b9a
parentd1ecd86b76b648acd42e9893b276f63f9ff5a5ad
Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:
Makefile
Makefile
tg.sh