Merge branch 'joris'
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 2 Mar 2009 19:51:34 +0000 (20:51 +0100)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 2 Mar 2009 19:51:34 +0000 (20:51 +0100)
commit4795e2ddd5587464837e478bfb1b8e508c957424
tree979cdc5dec892354e570bc2bc05119296437dcc1
parent507b3c2f2f9154d24cb333c48150d5514660a9f9
parentc610106d5c0392967cd0d7e1cf0ba3be2913743d
Merge branch 'joris'

Conflicts:
example.cpp
include/dai/factor.h
include/dai/var.h
src/bp.cpp
examples/example.cpp
include/dai/bp.h
include/dai/factor.h
include/dai/factorgraph.h
include/dai/index.h
include/dai/prob.h
include/dai/var.h
src/bp.cpp