org-mode

Commit Graph

Author	SHA1	Message	Date
Bastien Guerry	60b23bdeac	Merge branch 'maint' Conflicts: contrib/lisp/htmlize.el etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc lisp/org-exp-blocks.el	2013-01-01 16:06:17 +01:00
Jambunathan K	293a14d13f	Update OpenDocument schema files to v1.2 OASIS standard * etc/schema/od-schema-v1.2-os.rnc: OASIS standard * etc/schema/od-manifest-schema-v1.2-os.rnc: OASIS standard * etc/schema/schemas.xml: Fix uri to rnc files. * lisp/org-odt.el (org-export-odt-schema-dir): Modified to accommodate change in rnc file names. * contrib/lisp/org-e-odt.el (org-e-odt-schema-dir): Modified to accommodate change in rnc file names.	2012-12-23 12:44:42 +01:00

Author

SHA1

Message

Date

Bastien Guerry

60b23bdeac

Merge branch 'maint'

Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el

2013-01-01 16:06:17 +01:00

Jambunathan K

293a14d13f

Update OpenDocument schema files to v1.2 OASIS standard

* etc/schema/od-schema-v1.2-os.rnc: OASIS standard
* etc/schema/od-manifest-schema-v1.2-os.rnc: OASIS standard
* etc/schema/schemas.xml: Fix uri to rnc files.
* lisp/org-odt.el (org-export-odt-schema-dir): Modified to
accommodate change in rnc file names.
* contrib/lisp/org-e-odt.el (org-e-odt-schema-dir): Modified
to accommodate change in rnc file names.

2012-12-23 12:44:42 +01:00

2 Commits