Merge branch 'pletscher'
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 13 Oct 2009 15:12:07 +0000 (17:12 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 13 Oct 2009 15:12:07 +0000 (17:12 +0200)
Conflicts:

Makefile.CYGWIN
Makefile.LINUX
Makefile.MACOSX
Makefile.WINDOWS

1  2 
Makefile.CYGWIN
Makefile.LINUX
Makefile.MACOSX
Makefile.WINDOWS

diff --cc Makefile.CYGWIN
Simple merge
diff --cc Makefile.LINUX
Simple merge
diff --cc Makefile.MACOSX
Simple merge
Simple merge