fix errors from rebase
authorgregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 01:46:08 +0000 (02:46 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 01:46:08 +0000 (02:46 +0100)
commitffd9355f36e8e65e0e9fb1a8158495c15b002642
treeb324529c2883b657d26a70582be5a00300424014
parent2c0b48ee5065f8a653264ecb722e9cb0e91664de
fix errors from rebase
.gitignore
src/Makefile.am [deleted file]