Merge from upstream on 2012-05-22

2012-05-24 23:14:28 +09:00
parent 6ab06bbcd2
commit dbd52ac2ca
9 changed files with 38 additions and 377 deletions
--- a/version.c.in
+++ b/version.c.in
@@ -1,5 +1,5 @@
-/* $Id: version.c.in,v 1.48 2011/01/15 07:52:48 inu Exp $ */
-#define CURRENT_VERSION "w3m/0.5.3"
+/* $Id: version.c.in,v 1.49 2012/05/22 09:45:56 inu Exp $ */
+#define CURRENT_VERSION "w3m/0.5.3+cvs"

 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;