Merge branch 'eaton'
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 4 Aug 2009 15:35:49 +0000 (17:35 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Tue, 4 Aug 2009 15:35:49 +0000 (17:35 +0200)
commitae0fc30e10be6683cbfc209dcee56f34234a6cb8
tree3f3d22cbd639e7ac18b7ecfbc8f54d8bb80143c4
parent3ad3c2c9ce7cee50cf0fa731cb5c6bf6f36fa45a
parent641637a93f2a276063b3b4aa5a45ee2aa73cc496
Merge branch 'eaton'

Conflicts:

ChangeLog
Makefile
include/dai/daialg.h
19 files changed:
ChangeLog
Makefile
Makefile.CYGWIN
Makefile.LINUX
Makefile.MACOSX
Makefile.WINDOWS
README
include/dai/alldai.h
include/dai/bipgraph.h
include/dai/bp.h
include/dai/daialg.h
include/dai/doc.h
include/dai/factorgraph.h
include/dai/lc.h
include/dai/mr.h
include/dai/util.h
src/bp.cpp
src/factorgraph.cpp
tests/testdai.cpp