fix Makefile (remove leftover git conflicts)
commit5f5b59dcf7bc128b9f4ec10a9e958cf8bb9c9a5a
authorXazZ <devel@xazz.no-ip.info>
Sat, 12 Jul 2008 14:37:34 +0000 (12 16:37 +0200)
committerXazZ <devel@xazz.no-ip.info>
Sat, 12 Jul 2008 14:37:34 +0000 (12 16:37 +0200)
tree13c529a86a38ae7840643c9b7dfc9fbd2a58c3f6
parent45384ddc56d88d1708de81f8c72d34793333a8bb
fix Makefile (remove leftover git conflicts)
Makefile