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)
Conflicts:
ChangeLog

1  2 
src/util.cpp

diff --cc src/util.cpp
Simple merge