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

projects / libdai.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ad3c2c 641637a)

author	Joris Mooij <joris.mooij@tuebingen.mpg.de>
	Tue, 4 Aug 2009 15:35:49 +0000 (17:35 +0200)
committer	Joris Mooij <joris.mooij@tuebingen.mpg.de>
	Tue, 4 Aug 2009 15:35:49 +0000 (17:35 +0200)
commit	ae0fc30e10be6683cbfc209dcee56f34234a6cb8
tree	3f3d22cbd639e7ac18b7ecfbc8f54d8bb80143c4	tree \| snapshot
parent	3ad3c2c9ce7cee50cf0fa731cb5c6bf6f36fa45a	commit \| diff
parent	641637a93f2a276063b3b4aa5a45ee2aa73cc496	commit \| diff

Merge branch 'eaton'

Conflicts:

ChangeLog
Makefile
include/dai/daialg.h

19 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.CYGWIN	diff1 \|	diff2 \|	blob \| history
Makefile.LINUX	diff1 \|	diff2 \|	blob \| history
Makefile.MACOSX	diff1 \|	diff2 \|	blob \| history
Makefile.WINDOWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
include/dai/alldai.h	diff1 \|	diff2 \|	blob \| history
include/dai/bipgraph.h	diff1 \|	diff2 \|	blob \| history
include/dai/bp.h	diff1 \|	diff2 \|	blob \| history
include/dai/daialg.h	diff1 \|	diff2 \|	blob \| history
include/dai/doc.h	diff1 \|	diff2 \|	blob \| history
include/dai/factorgraph.h	diff1 \|	diff2 \|	blob \| history
include/dai/lc.h	diff1 \|	diff2 \|	blob \| history
include/dai/mr.h	diff1 \|	diff2 \|	blob \| history
include/dai/util.h	diff1 \|	diff2 \|	blob \| history
src/bp.cpp	diff1 \|	diff2 \|	blob \| history
src/factorgraph.cpp	diff1 \|	diff2 \|	blob \| history
tests/testdai.cpp	diff1 \|	diff2 \|	blob \| history

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