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
..
test-ob-C.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-R.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-awk.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-emacs-lisp.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-ob-exp.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-ob-fortran.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-lilypond.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-lob.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-maxima.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-octave.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-python.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-sh.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-table.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob-tangle.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-ob.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-org-clock.el	Fix new test for clocktables	2012-12-07 19:50:01 +01:00
test-org-element.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-org-exp.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-org-export.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-org-footnote.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-org-html.el	Fix copyright notices for test files.	2012-12-13 17:24:19 +01:00
test-org-list.el	Update copyright years.	2013-01-01 16:04:24 +01:00
test-org-src.el	Merge branch 'maint'	2013-01-01 16:06:17 +01:00
test-org-table.el	Use nan for empty fields in Calc formulas	2012-12-29 14:33:52 +01:00
test-org.el	org.el (org-parse-time-string): Parse <+1w> and friends	2012-12-30 10:27:02 +01:00
test-property-inheritance.el	Update copyright years.	2013-01-01 16:04:24 +01:00