aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.jap9
-rw-r--r--src/ChangeLog40
-rw-r--r--src/ChangeLog.jap35
4 files changed, 53 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 98daa13a..bd54fa9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * ChangeLog.jap: Merge with this ChangeLog. Remove.
+
+ 2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * config/open-axiom.m4 (OPENAXIOM_HOST_PROGS): Don't check for awk
+ anymore.
+
+ 2009-07-16 Alfredo Portes <doyenatccny@gmail.com>
+
+ * configure.ac.pamphlet: Remove presea.
+
2010-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Remove.
diff --git a/ChangeLog.jap b/ChangeLog.jap
deleted file mode 100644
index cd01fdf3..00000000
--- a/ChangeLog.jap
+++ /dev/null
@@ -1,9 +0,0 @@
-2010-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
-
- * config/open-axiom.m4 (OPENAXIOM_HOST_PROGS): Don't check for awk
- anymore.
-
-2009-07-16 Alfredo Portes <doyenatccny@gmail.com>
-
- * configure.ac.pamphlet: Remove presea.
-
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.
-