fixed .gitignore after move
[pub/jan/parprog.git] / merge / Makefile
2012-01-26 David Kaufmannmoved code