* Merge branch 'branch_0.10.0' into branch_0.11.0

Conflicts:

	configure
	configure.ac
	include/config.h
	src/chxj_node_exchange.c

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2402 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/ChangeLog b/ChangeLog
index b4656d2..79da48e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.10.5-1) unstable; urgency=low
+
+  * Fixed bug.
+    - the value of the script tag is displayed.
+    - the value of the object tag is displayed.
+
+ -- Atsushi Konno <konn@users.sourceforege.jp>  Fri, 18 Apr 2008 22:25:55 +0900
+
 libapache2-mod-chxj (0.10.4-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/debian/changelog b/debian/changelog
index 30ff199..fc1164b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.10.5-1) unstable; urgency=low
+
+  * Fixed bug.
+    - the value of the script tag is displayed.
+    - the value of the object tag is displayed.
+
+ -- Atsushi Konno <konn@users.sourceforege.jp>  Fri, 18 Apr 2008 22:25:55 +0900
+
 libapache2-mod-chxj (0.10.4-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/src/chxj_node_exchange.c b/src/chxj_node_exchange.c
index adba470..240e239 100644 (file)
--- a/src/chxj_node_exchange.c
+++ b/src/chxj_node_exchange.c
@@ -666,7 +666,7 @@ chxj_node_exchange(
       /*----------------------------------------------------------------------*/
       else 
       if (strcasecmp(name, "script") == 0) {
-        /* ignore */
+        /* ignore script block */
       }
       else {
         chxj_node_exchange(spec, r, pdoc, doc, child, indent+1);