matita.cs.unibo.it Git - helm.git/commit

]> matita.cs.unibo.it Git - helm.git/commit

projects / helm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 95a14ce) | patch

author	denes <??>
	Wed, 22 Jul 2009 11:13:45 +0000 (11:13 +0000)
committer	denes <??>
	Wed, 22 Jul 2009 11:13:45 +0000 (11:13 +0000)
commit	39a2078b0e835d39895a5b6c0862d668ece544f3
tree	71dbe3985f4c90c66dde7d99bed51e0a5ca682ad	tree \| snapshot
parent	95a14ced97592a4116485f94c6ffa806feb62dbc	commit \| diff

Fixed conflicts due to problem when merging with UEQ implementation

15 files changed:

helm/software/components/ng_paramodulation/.depend		diff \| blob \| history
helm/software/components/ng_paramodulation/Makefile		diff \| blob \| history
helm/software/components/ng_paramodulation/foUnif.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/foUtils.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/index.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/index.mli		diff \| blob \| history
helm/software/components/ng_paramodulation/nCicParamod.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/orderings.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/paramod.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/paramod.mli		diff \| blob \| history
helm/software/components/ng_paramodulation/pp.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/stats.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/superposition.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/terms.ml		diff \| blob \| history
helm/software/components/ng_paramodulation/terms.mli		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.