Fixed conflicts due to problem when merging with UEQ implementation

[helm.git] / helm / software / components / ng_paramodulation / .depend

diff --git a/helm/software/components/ng_paramodulation/.depend b/helm/software/components/ng_paramodulation/.depend
index ead11bcc5169255404b47d27fa86ac7045cb0199..6dc4150c1c6b9ec51ca09ea100c0d3baa852114e 100644 (file)
--- a/helm/software/components/ng_paramodulation/.depend
+++ b/helm/software/components/ng_paramodulation/.depend
@@ -1,43 +1,48 @@
 pp.cmi: terms.cmi 
 foSubst.cmi: terms.cmi 
 orderings.cmi: terms.cmi 
-foUtils.cmi: terms.cmi 
-index.cmi: terms.cmi 
-foUnif.cmi: terms.cmi 
-superposition.cmi: terms.cmi index.cmi 
-paramod.cmi: terms.cmi 
+foUtils.cmi: terms.cmi orderings.cmi 
+index.cmi: terms.cmi orderings.cmi 
+foUnif.cmi: terms.cmi orderings.cmi 
+superposition.cmi: terms.cmi orderings.cmi index.cmi 
+stats.cmi: terms.cmi orderings.cmi 
+paramod.cmi: terms.cmi orderings.cmi 
 nCicBlob.cmi: terms.cmi 
 cicBlob.cmi: terms.cmi 
 nCicProof.cmi: terms.cmi 
 terms.cmo: terms.cmi 
 terms.cmx: terms.cmi 
-pp.cmo: terms.cmi foUtils.cmi pp.cmi 
-pp.cmx: terms.cmx foUtils.cmx pp.cmi 
+pp.cmo: terms.cmi pp.cmi 
+pp.cmx: terms.cmx pp.cmi 
 foSubst.cmo: terms.cmi foSubst.cmi 
 foSubst.cmx: terms.cmx foSubst.cmi 
-orderings.cmo: terms.cmi orderings.cmi 
-orderings.cmx: terms.cmx orderings.cmi 
+orderings.cmo: terms.cmi pp.cmi orderings.cmi 
+orderings.cmx: terms.cmx pp.cmx orderings.cmi 
 foUtils.cmo: terms.cmi orderings.cmi foSubst.cmi foUtils.cmi 
 foUtils.cmx: terms.cmx orderings.cmx foSubst.cmx foUtils.cmi 
-index.cmo: terms.cmi foUtils.cmi index.cmi 
-index.cmx: terms.cmx foUtils.cmx index.cmi 
-foUnif.cmo: terms.cmi foUtils.cmi foSubst.cmi foUnif.cmi 
-foUnif.cmx: terms.cmx foUtils.cmx foSubst.cmx foUnif.cmi 
+index.cmo: terms.cmi pp.cmi orderings.cmi foUtils.cmi foUnif.cmi foSubst.cmi \
+    index.cmi 
+index.cmx: terms.cmx pp.cmx orderings.cmx foUtils.cmx foUnif.cmx foSubst.cmx \
+    index.cmi 
+foUnif.cmo: terms.cmi orderings.cmi foUtils.cmi foSubst.cmi foUnif.cmi 
+foUnif.cmx: terms.cmx orderings.cmx foUtils.cmx foSubst.cmx foUnif.cmi 
 superposition.cmo: terms.cmi pp.cmi orderings.cmi index.cmi foUtils.cmi \
     foUnif.cmi foSubst.cmi superposition.cmi 
 superposition.cmx: terms.cmx pp.cmx orderings.cmx index.cmx foUtils.cmx \
     foUnif.cmx foSubst.cmx superposition.cmi 
-paramod.cmo: terms.cmi superposition.cmi pp.cmi index.cmi foUtils.cmi \
-    foUnif.cmi paramod.cmi 
-paramod.cmx: terms.cmx superposition.cmx pp.cmx index.cmx foUtils.cmx \
-    foUnif.cmx paramod.cmi 
+stats.cmo: terms.cmi stats.cmi 
+stats.cmx: terms.cmx stats.cmi 
+paramod.cmo: terms.cmi superposition.cmi pp.cmi orderings.cmi index.cmi \
+    foUtils.cmi foUnif.cmi paramod.cmi 
+paramod.cmx: terms.cmx superposition.cmx pp.cmx orderings.cmx index.cmx \
+    foUtils.cmx foUnif.cmx paramod.cmi 
 nCicBlob.cmo: terms.cmi foUtils.cmi nCicBlob.cmi 
 nCicBlob.cmx: terms.cmx foUtils.cmx nCicBlob.cmi 
 cicBlob.cmo: terms.cmi cicBlob.cmi 
 cicBlob.cmx: terms.cmx cicBlob.cmi 
 nCicProof.cmo: terms.cmi pp.cmi nCicBlob.cmi foSubst.cmi nCicProof.cmi 
 nCicProof.cmx: terms.cmx pp.cmx nCicBlob.cmx foSubst.cmx nCicProof.cmi 
-nCicParamod.cmo: terms.cmi pp.cmi paramod.cmi nCicProof.cmi nCicBlob.cmi \
-    nCicParamod.cmi 
-nCicParamod.cmx: terms.cmx pp.cmx paramod.cmx nCicProof.cmx nCicBlob.cmx \
-    nCicParamod.cmi 
+nCicParamod.cmo: terms.cmi pp.cmi paramod.cmi orderings.cmi nCicProof.cmi \
+    nCicBlob.cmi nCicParamod.cmi 
+nCicParamod.cmx: terms.cmx pp.cmx paramod.cmx orderings.cmx nCicProof.cmx \
+    nCicBlob.cmx nCicParamod.cmi