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
..
default.mk	Revert "Fix previous commit."	2012-10-03 12:13:33 +02:00
eldo.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
fake_change_log.pl	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
git-changelog	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
guidesplit.pl	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
list-hooks.pl	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
make_emacs_changelog	mk/make_emacs_changelog: Small fix	2012-09-03 12:47:02 +02:00
manfull.pl	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
mansplit.pl	Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout	2012-08-26 15:27:19 +02:00
org-fixup.el	Revert "org-odt.el (and org-e-odt.el): Simplify the way style/schema files are found"	2012-10-03 12:13:47 +02:00
orgcard2txt.pl	Update copyright years.	2013-01-01 16:04:24 +01:00
pw	Update copyright years.	2013-01-01 16:04:24 +01:00
server.mk	mk/server.mk: Use /elpa/ instead of /pkg/daily/	2012-09-28 10:05:10 +02:00
set-version.pl	Reorder the README files.	2012-09-22 10:33:08 +02:00
targets.mk	Makefile: do not attempt to show Org version from Emacs' perspective	2012-09-29 11:49:58 +02:00