chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@madduck.net>
Fri, 26 Sep 2008 18:07:33 +0000 (20:07 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 26 Sep 2008 18:07:33 +0000 (20:07 +0200)
commit5aa8cf9d4fba8b6dbbd7878eb78b2600e3736b9a
tree4fdf1b3b2acb0d442f82f37454822aef81a743d2
parent355c550db9bdb25237311a4047cfc6c641e2dcee
parent41ad0fd31729461c5c9c3926c28011770ccfc9e7
Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:

tg.sh
Makefile
tg.sh