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
..
.aspell.org.conf	Track support files useful in checking Org documentation.	2008-04-01 15:59:35 +02:00
.nosearch	Add .nosearch file to the doc/ subdirectory.	2008-12-17 17:25:31 +01:00
Documentation_Standards.org	Fix some typos	2009-11-15 10:04:23 +01:00
Makefile	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
dir	Split out a number of files from org.el, and reorganize the	2008-03-28 09:57:14 +01:00
doclicense.texi	Update copyright years.	2013-01-01 16:04:24 +01:00
org.texi	Use nan for empty fields in Calc formulas	2012-12-29 14:33:52 +01:00
orgcard.tex	Update copyright years.	2013-01-01 16:04:24 +01:00
orgguide.texi	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
pdflayout.sty	Update copyright years.	2013-01-01 16:04:24 +01:00
texinfo.tex	Update copyright years.	2013-01-01 16:04:24 +01:00