Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 30 Nov 2010 21:17:26 +0000 (22:17 +0100)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 30 Nov 2010 21:17:26 +0000 (22:17 +0100)
commit1fc890f6b1da3c3715f05b5a6dd6a0b658649985
tree532ae2b0d868417502cf7e9130605db07acf045c
parentd190326501817a4227f096d66afc9e63de34f92a
parentf7e7f4578f1d2d229c6d0adea59c877df216de23
Merge branch 'master' of git.tuebingen.mpg.de:libdai

Conflicts:
ChangeLog
src/util.cpp