git.sourceforge.jp Git - modchxj/mod_chxj.git/commit

(root) / modchxj / mod_chxj.git / commit

author	konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
	Tue, 3 Mar 2009 17:52:31 +0000 (17:52 +0000)
committer	konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
	Tue, 3 Mar 2009 17:52:31 +0000 (17:52 +0000)
commit	47179000eed5de253cf0ce74d94cf8eb578f0cc5
tree	1e1ee357e8c3790a23598a5bf6b15c6eaffc9c0f	tree \| snapshot
parent	66b3c2e60dc48e1a78ecc4799511c780edec29c2	commit \| diff

Merge branch 'branch_0.13.0' into branch_0.13.0-svn

Conflicts:
etc/device_data.xml

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

24 files changed:

ChangeLog		diff \| blob \| history
debian-sarge/changelog		diff \| blob \| history
debian/changelog		diff \| blob \| history
etc/device_data.xml		diff \| blob \| history
include/chxj_chtml10.h		diff \| blob \| history
include/chxj_chtml20.h		diff \| blob \| history
include/chxj_chtml30.h		diff \| blob \| history
include/chxj_chtml40.h		diff \| blob \| history
include/chxj_chtml50.h		diff \| blob \| history
include/chxj_jhtml.h		diff \| blob \| history
include/chxj_jxhtml.h		diff \| blob \| history
include/chxj_specified_device.h		diff \| blob \| history
include/chxj_xhtml_mobile_1_0.h		diff \| blob \| history
include/mod_chxj.h		diff \| blob \| history
src/chxj_chtml10.c		diff \| blob \| history
src/chxj_chtml20.c		diff \| blob \| history
src/chxj_chtml30.c		diff \| blob \| history
src/chxj_chtml40.c		diff \| blob \| history
src/chxj_chtml50.c		diff \| blob \| history
src/chxj_jhtml.c		diff \| blob \| history
src/chxj_jxhtml.c		diff \| blob \| history
src/chxj_tag_util.c		diff \| blob \| history
src/chxj_xhtml_mobile_1_0.c		diff \| blob \| history
src/mod_chxj.c		diff \| blob \| history

mod_chxj

RSS Atom

About OSDN

Find Software

Develop Software

Help