summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2010-01-15 13:58:52 -0800
committerKaz Kylheku <kaz@kylheku.com>2010-01-15 13:58:52 -0800
commit50e076ed6d30c602eef8c25f260bd7484ee4bd0d (patch)
tree400985c92d3ba5222a9b67189640e0e03e741b14
parent25e0952bbee726a4de283b2ae6efa49b49c5cf0b (diff)
parent3d1479da292da7d2d24979ad6a1bf84f3737f82c (diff)
downloadtxr-50e076ed6d30c602eef8c25f260bd7484ee4bd0d.tar.gz
txr-50e076ed6d30c602eef8c25f260bd7484ee4bd0d.tar.bz2
txr-50e076ed6d30c602eef8c25f260bd7484ee4bd0d.zip
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/txr
-rw-r--r--ChangeLog6
-rw-r--r--txr.12
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73a2b040..5d957747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-15 Kaz Kylheku <kkylheku@gmail.com>
+
+ * txr.1: Fix accidental edit garbage.
+
2010-01-14 Kaz Kylheku <kkylheku@gmail.com>
* txr.1: Fix accidental .b, which should have been .B.
@@ -8,7 +12,7 @@
2010-01-14 Kaz Kylheku <kkylheku@gmail.com>
* regex.c (reg_derivative): Bugfix: remove invalid
- algebraic reductions in the derivative for the operator.
+ algebraic reductions in the derivative for the or operator.
2010-01-13 Kaz Kylheku <kkylheku@gmail.com>
diff --git a/txr.1 b/txr.1
index 4ced9699..b82bac26 100644
--- a/txr.1
+++ b/txr.1
@@ -1,4 +1,4 @@
-5\"Copyright (C) 2009, Kaz Kylheku <kkylheku@gmail.com>.
+.\"Copyright (C) 2009, Kaz Kylheku <kkylheku@gmail.com>.
.\"All rights reserved.
.\"
.\"BSD License: