Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 19:27:44 +0000 (21:27 +0200)
1  2 
src/jtree.cpp
src/treeep.cpp

diff --cc src/jtree.cpp
Simple merge
diff --cc src/treeep.cpp
Simple merge