aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-08-18 02:19:42 +0000
committerdos-reis <gdr@axiomatics.org>2010-08-18 02:19:42 +0000
commitb3ba7224176ee0a487da3221693d2b15bb7c8d3a (patch)
tree0353c5772420e24d4aa5299585218878cc4361a0 /src
parentdf8254a5fa36257630ddb9d8a9de5ac2980d6ab4 (diff)
downloadopen-axiom-b3ba7224176ee0a487da3221693d2b15bb7c8d3a.tar.gz
Merge jap-sandbox ChangeLogs.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog40
-rw-r--r--src/ChangeLog.jap35
2 files changed, 40 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0160c81b..a291b326 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,43 @@
+2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * ChangeLog.jap: Merge into here. Remove
+
+ 2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * hyper/htsearch.cc: Rename from htsearch.c to avoid confusions.
+
+ 2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * hyper/htsearch.c: Tidy.
+
+ 2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * hyper/Makefile.in (${OUTLIB}/htsearch$(EXEEXT)): Link with a C++
+ compiler.
+
+ 2010-07-25 Alfredo Portes <doyenatccny@gmail.com>
+
+ * src/lib/cfuns-c.c: (oa_insert) Change return value.
+ Misc cleanup.
+ * src/include/cfuns.h: Adjust.
+
+ 2010-07-12 Alfredo Portes <doyenatccny@gmail.com>
+
+ * src/hyper/Makefile.in: Adjust.
+ * src/hyper/htsearch.c: Add more documentation.
+ * src/lib/cfuns-c.c: Add String manipulation functions.
+
+ 2009-07-16 Alfredo Portes <doyenatccny@gmail.com>
+
+ * lib/cfuns-c.c: New string manipulation functions.
+ * include/cfuns.h: Likewise.
+ * hyper/htsearch.c: Add new C replacement for htsearch
+ and presea scripts.
+ * hyper/htsearch: Remove.
+ * hyper/presea.in: Remove.
+ * hyper/Makefile.in: Adjust.
+
+
2010-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu>
* algebra/float.spad.pamphlet (Float): Tidy.
diff --git a/src/ChangeLog.jap b/src/ChangeLog.jap
deleted file mode 100644
index 055af804..00000000
--- a/src/ChangeLog.jap
+++ /dev/null
@@ -1,35 +0,0 @@
-2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
-
- * hyper/htsearch.cc: Rename from htsearch.c to avoid confusions.
-
-2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
-
- * hyper/htsearch.c: Tidy.
-
-2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
-
- * hyper/Makefile.in (${OUTLIB}/htsearch$(EXEEXT)): Link with a C++
- compiler.
-
-2010-07-25 Alfredo Portes <doyenatccny@gmail.com>
-
- * src/lib/cfuns-c.c: (oa_insert) Change return value.
- Misc cleanup.
- * src/include/cfuns.h: Adjust.
-
-2010-07-12 Alfredo Portes <doyenatccny@gmail.com>
-
- * src/hyper/Makefile.in: Adjust.
- * src/hyper/htsearch.c: Add more documentation.
- * src/lib/cfuns-c.c: Add String manipulation functions.
-
-2009-07-16 Alfredo Portes <doyenatccny@gmail.com>
-
- * lib/cfuns-c.c: New string manipulation functions.
- * include/cfuns.h: Likewise.
- * hyper/htsearch.c: Add new C replacement for htsearch
- and presea scripts.
- * hyper/htsearch: Remove.
- * hyper/presea.in: Remove.
- * hyper/Makefile.in: Adjust.
-