Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Fri, 22 Jan 2010 13:09:11 +0000 (14:09 +0100)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Fri, 22 Jan 2010 13:09:11 +0000 (14:09 +0100)
commit3e0240b1662198e5f7ffb091e7a00b35bd19126a
tree58dfb03390005b4c5639aaf2387039a420764d37
parent8ac363ae4037fa50376dc391f37ee698c69b918e
parent6540e9fdff46927ad34c4bb3995bb2dd91be043d
Merge branch 'master' of git.tuebingen.mpg.de:libdai

Conflicts:
include/dai/doc.h
include/dai/alldai.h
include/dai/doc.h
src/alldai.cpp