Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Wed, 6 Oct 2010 08:59:33 +0000 (10:59 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Wed, 6 Oct 2010 08:59:33 +0000 (10:59 +0200)
1  2 
include/dai/doc.h

Simple merge