Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 21 Dec 2009 10:35:42 +0000 (11:35 +0100)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 21 Dec 2009 10:35:42 +0000 (11:35 +0100)
commitc22fd58fb9fd99f3cf7ce35a84c7cb1357e7f2b2
tree877b091a1112f1e83d02d492930c79b64a636831
parentb34b3a3929dbf8507293e22bd2a56cc27ec332e4
parent9b4d1b02d27a7169c82854d8949468ccc715674e
Merge branch 'master' of git.tuebingen.mpg.de:libdai

Conflicts:
ChangeLog
ChangeLog
Makefile.MACOSX