git.tuebingen.mpg.de Git - libdai.git/commit

projects / libdai.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 20e81db b16ded6)

author	Joris Mooij <jorism@marvin.jorismooij.nl>
	Sun, 21 Sep 2008 07:35:08 +0000 (09:35 +0200)
committer	Joris Mooij <jorism@marvin.jorismooij.nl>
	Sun, 21 Sep 2008 07:35:08 +0000 (09:35 +0200)
commit	f5079f41271b77104b061ede330a702544af27e4
tree	eb6cd050aba2a116706aaf53c2af13b7b4a9d489	tree \| snapshot
parent	20e81db087f146a73553832f080226b1e3bff80f	commit \| diff
parent	b16ded667d00bcc92d5046574729ea49728d62f4	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
include/dai/daialg.h	diff1 \|	diff2 \|	blob \| history
include/dai/hak.h	diff1 \|	diff2 \|	blob \| history
include/dai/jtree.h	diff1 \|	diff2 \|	blob \| history
include/dai/lc.h	diff1 \|	diff2 \|	blob \| history
include/dai/mf.h	diff1 \|	diff2 \|	blob \| history
include/dai/mr.h	diff1 \|	diff2 \|	blob \| history
include/dai/treeep.h	diff1 \|	diff2 \|	blob \| history
src/alldai.cpp	diff1 \|	diff2 \|	blob \| history
src/bp.cpp	diff1 \|	diff2 \|	blob \| history
src/daialg.cpp	diff1 \|	diff2 \|	blob \| history
src/hak.cpp	diff1 \|	diff2 \|	blob \| history
src/jtree.cpp	diff1 \|	diff2 \|	blob \| history
src/lc.cpp	diff1 \|	diff2 \|	blob \| history
src/mf.cpp	diff1 \|	diff2 \|	blob \| history
src/mr.cpp	diff1 \|	diff2 \|	blob \| history
src/properties.cpp	diff1 \|	diff2 \|	blob \| history
src/treeep.cpp	diff1 \|	diff2 \|	blob \| history
tests/test.cpp	diff1 \|	diff2 \|	blob \| history

libDAI - A free/open source C++ library for Discrete Approximate Inference methods