chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@debian.org>
Tue, 12 Aug 2008 17:34:25 +0000 (14:34 -0300)
committermartin f. krafft <madduck@debian.org>
Tue, 12 Aug 2008 17:34:25 +0000 (14:34 -0300)
commit5a4688543ef23f27f0c97cee3ac4d28f69232ad9
tree2fbc1aaf20a59a30c69ba186fa00f8757f660f67
parent2089e9653f8679cd7c8ed4bfa741bc00042393bc
parent16ae579018ef5e931af04953a47593c8be9e3e77
Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:

Makefile
Makefile