chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@debian.org>
Wed, 10 Sep 2008 08:36:34 +0000 (09:36 +0100)
committermartin f. krafft <madduck@debian.org>
Wed, 10 Sep 2008 08:36:34 +0000 (09:36 +0100)
commit0cbd6990ae81d73fdec784f4bd8e7b8e42d16e97
tree8284aec23b8bee0a8fb430dc4e154e90b334aaa8
parent5a4688543ef23f27f0c97cee3ac4d28f69232ad9
parentb8ce1c261c6985c17af7f6ae7894894214ce44ea
Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:
Makefile
tg.sh
Makefile
tg.sh