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
..
schema	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
styles	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
Makefile	move schema files to etc/ and modify makefile to install them into $(datadir)	2012-04-20 21:04:12 +02:00
ORG-NEWS	Fix typos fixed in Emacs (part 1)	2012-10-23 18:39:20 +02:00