mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
27,581 Commits 3 Branches 422 Tags 142 MiB
Commit Graph

8 Commits

Author SHA1 Message Date
Kyle Meyer afb948e578 Backport commit f1f351def from Emacs 
* etc/schema/od-schema-v1.2-os.rnc: Delete.

* etc/schema/OpenDocument-schema-v1.3.rnc:
* etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc:
Copy from Emacs tree.

* etc/schema/schemas.xml: Incorporate changes from Emacs's f1f351def.

This is not a typical port because Org's schemas.xml is a subset of
Emacs's.  The changes here follow what's proposed in
<https://orgmode.org/list/87o8d07mpr.fsf@kyleam.com>, with the
addition of copying OpenDocument-schema-v1.3+libreoffice.rnc (which I
overlooked when writing that message).
 2021-06-27 23:30:22 -04:00
Kyle Meyer f2980782c4 Clean up spacing to pass Emacs's pre-commit check 
This is in preparation for syncing with the Emacs repo.
 2017-06-22 13:31:04 -04:00
Bastien Guerry 0beda99171 Revert "Update copyright years." 
This reverts commit 21105594fc.
 2014-01-05 06:28:07 +01:00
Bastien Guerry 21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
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
Bastien Guerry 98cd4687a2 Update copyright years. 
Happy new year!
 2013-01-01 16:04:24 +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
Achim Gratz b323d9e5c3 move schema files to etc/ and modify makefile to install them into $(datadir) 
etc/Makefile: add "schema" to $(ETCDIRS)

	contrib/odt/etc/schema/od-manifest-schema-v1.2-cs01.rnc: move to etc/schema/od-manifest-schema-v1.2-cs01.rnc

	contrib/odt/etc/schema/od-schema-v1.2-cs01.rnc: move to etc/schema/od-schema-v1.2-cs01.rn

	contrib/odt/etc/schema/schemas.xml: move to etc/schema/schemas.xml
 2012-04-20 21:04:12 +02:00