# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1267965945 21600
# Node ID e84ee15ca495c229dbeeeb8a62887d9e80325d98
# Parent  b42a3c0d709ec04ebb27f20b40c25666b0926ca6# Parent  b2dcf6a6d8ab20260bc2a7db1e254f7f058aacd1
merge

diff -r b42a3c0d709e -r e84ee15ca495 .hgtags
diff -r b42a3c0d709e -r e84ee15ca495 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Mar 07 06:42:03 2010 -0600
+++ b/lisp/ChangeLog	Sun Mar 07 06:45:45 2010 -0600
@@ -1,3 +1,10 @@
+2010-03-07  Ben Wing  <ben@xemacs.org>
+
+	* disp-table.el:
+	* disp-table.el (standard-display-g1):
+	* disp-table.el (standard-display-graphic):
+	Fix up docs; add comments about authorship.
+
 2010-03-06  Ben Wing  <ben@xemacs.org>
 
 	* test-harness.el:
diff -r b42a3c0d709e -r e84ee15ca495 lisp/disp-table.el