OSDN Git Service

* merge from mastergit
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sun, 27 Feb 2011 15:36:06 +0000 (15:36 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sun, 27 Feb 2011 15:36:06 +0000 (15:36 +0000)
commit96cc9fdac0cac2496160b14eb8c8d1f5b85b66b3
treed031a41e2f04b26bc8e325ed9a8fc5c886a3678b
parent6972bdeeb6d1380eb80f2252cef92b223973ea8f
  * merge from mastergit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4847 1a406e8e-add9-4483-a2c8-d8cac5b7c224
42 files changed:
Makefile.in
aclocal.m4
configure
configure.ac
etc/device_data.xml
etc/emoji.xml
include/chxj_add_device_env.h [changed mode: 0644->0755]
include/chxj_encoding.h
include/chxj_img_conv.h
include/chxj_load_device_data.h [changed mode: 0644->0755]
include/chxj_specified_device.h [changed mode: 0644->0755]
include/config.h
include/mod_chxj.h [changed mode: 0644->0755]
src/Makefile.in
src/chxj_add_device_env.c [changed mode: 0644->0755]
src/chxj_chtml10.c
src/chxj_chtml20.c
src/chxj_chtml30.c
src/chxj_chtml40.c
src/chxj_chtml50.c
src/chxj_cookie.c
src/chxj_encoding.c
src/chxj_hdml.c
src/chxj_img_conv.c
src/chxj_img_conv_format.c
src/chxj_ixhtml10.c [changed mode: 0644->0755]
src/chxj_jhtml.c
src/chxj_jreserved_tag.c
src/chxj_jxhtml.c [changed mode: 0644->0755]
src/chxj_load_device_data.c [changed mode: 0644->0755]
src/chxj_load_emoji_data.c
src/chxj_node_convert.c
src/chxj_serf.c
src/chxj_specified_device.c [changed mode: 0644->0755]
src/chxj_xhtml_mobile_1_0.c [changed mode: 0644->0755]
src/css/config.status
src/css/libtool
src/css/src/Makefile
src/mod_chxj.c [changed mode: 0644->0755]
src/qs_parse_tag.c
support/centos/mod-chxj.spec
test/chxj_ixhtml10/test_chxj_ixhtml10.c