Merge branch 'new-debian' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 02:01:22 +0000 (20:01 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 02:01:22 +0000 (20:01 -0600)
commit3b612efcd1dddc6a3d59012f7ed57754b1f798c2
tree18d50713491ef96c5c127a309f870efb6c33f98d
parente076773c1693e2a62bb828dee71c04c20dbab0a5
parent01eb36408d7e0e826b431fcc1d3b2deb23607e0b
Merge branch 'new-debian' into debian

Conflicts:
ChangeLog
debian/altos.install
debian/changelog
debian/control
debian/copyright
debian/dirs
debian/docs
debian/menu
debian/rules
src/Makefile