Commit Graph

2 Commits

Author SHA1 Message Date
Vítor Santos Costa
79d1bf5eec Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
Conflicts:
	OPTYap/opt.config.h
	OPTYap/opt.structs.h
2011-11-30 13:24:12 +00:00
Vitor Santos Costa
be345a0387 update to recent ProbLog. 2011-06-26 23:13:43 +01:00