Merge branch 'master' of git@git.tuebingen.mpg.de:libdai
authorJoris Mooij <jorism@marvin.jorismooij.nl>
Sun, 21 Sep 2008 07:35:08 +0000 (09:35 +0200)
committerJoris Mooij <jorism@marvin.jorismooij.nl>
Sun, 21 Sep 2008 07:35:08 +0000 (09:35 +0200)
commitf5079f41271b77104b061ede330a702544af27e4
treeeb6cd050aba2a116706aaf53c2af13b7b4a9d489
parent20e81db087f146a73553832f080226b1e3bff80f
parentb16ded667d00bcc92d5046574729ea49728d62f4
Merge branch 'master' of git@git.tuebingen.mpg.de:libdai

Conflicts:

include/dai/lc.h
include/dai/mr.h
src/alldai.cpp
src/lc.cpp
tests/test.cpp
19 files changed:
include/dai/bp.h
include/dai/daialg.h
include/dai/hak.h
include/dai/jtree.h
include/dai/lc.h
include/dai/mf.h
include/dai/mr.h
include/dai/treeep.h
src/alldai.cpp
src/bp.cpp
src/daialg.cpp
src/hak.cpp
src/jtree.cpp
src/lc.cpp
src/mf.cpp
src/mr.cpp
src/properties.cpp
src/treeep.cpp
tests/test.cpp