Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 13:09:05 +0100] rev 48807
Winkler --> Isabelle: simple renaming
Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 12:32:27 +0100] rev 48806
merged
Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 12:30:49 +0100] rev 48805
caused conflict in same line
diana <meindl_diana@yahoo.com> [Fri, 14 Dec 2012 12:27:38 +0100] rev 48804
cause conflict
Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 12:22:19 +0100] rev 48803
before starting transformation Winkler --> Isabelle
Before starting transformation of Winkler's notation to
Isabelle coding standards in "GDC_Poly.thy"
(reflected by tests in "gdc_poly.sml").
The relations between respective files is as follows
~~/test/Tools/isac/Knowledge/gdc_poly_winkler.sml
=
~~/src/Tools/isac/Knowledge/GDC_Poly.thy
(with minimal replacement: "text {* ... *}" --> "(* ... *)")
+
~~/test/Tools/isac/Knowledge/gdc_poly.sml
--------------
There are still conflicts between isac and GCD_Poly.thy,
becoming apparent in Test_Some.thy (while Test_Some2.thy works)
Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 11:39:17 +0100] rev 48802
merged
Walther Neuper <neuper@ist.tugraz.at> [Fri, 14 Dec 2012 10:21:34 +0100] rev 48801
accumulate values in Isac.thy, further trials
diana <meindl_diana@yahoo.com> [Fri, 14 Dec 2012 11:34:05 +0100] rev 48800
failed merge
diana <meindl_diana@yahoo.com> [Fri, 14 Dec 2012 10:27:02 +0100] rev 48799
GCD_Poly adopted Integer.gcd, ...
Walther Neuper <neuper@ist.tugraz.at> [Wed, 12 Dec 2012 13:31:25 +0100] rev 48798
dmeindl: better diff tool