Merge branch 'master' of git@git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Thu, 1 Apr 2010 12:38:52 +0000 (14:38 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Thu, 1 Apr 2010 12:38:52 +0000 (14:38 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge