Public Git Hosting - org-mode.git/commit

commit	60b23bdeac7a712e107f62af1183f8495bb1d74c
author	Bastien Guerry <bzg@altern.org>
	Tue, 1 Jan 2013 15:06:17 +0000 (1 16:06 +0100)
committer	Bastien Guerry <bzg@altern.org>
	Tue, 1 Jan 2013 15:06:17 +0000 (1 16:06 +0100)
tree	9b1cc9ff999c71c672e6fa0ea8dd7d89d9d8934b	tree \| snapshot (tar.gz zip)
parent	bd7c2a59e8ec5080b128ddbba51ce6eb799176e3	commit \| diff
parent	98cd4687a23956e3dc6cd9416a7ae867dcf22695	commit \| diff

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

88 files changed:

contrib/lisp/htmlize.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-contacts.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-ascii.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-beamer.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-groff.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-html.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-latex.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-man.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-odt.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-publish.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-texinfo.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-export.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-invoice.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-md.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-mime.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-notify.el	diff1 \|	diff2 \|	blob \| history
doc/orgguide.texi	diff1 \|	diff2 \|	blob \| history
etc/schema/od-manifest-schema-v1.2-os.rnc	diff1 \|	diff2 \|	blob \| history
etc/schema/od-schema-v1.2-os.rnc	diff1 \|	diff2 \|	blob \| history
lisp/ob-C.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-R.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-awk.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-calc.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-clojure.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-comint.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ditaa.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-dot.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-emacs-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-exp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-fortran.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-gnuplot.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-haskell.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-io.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-java.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-js.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-keys.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lilypond.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lob.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-maxima.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-mscgen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ocaml.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-octave.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-perl.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-picolisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-plantuml.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-python.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ref.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ruby.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sass.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-scala.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-scheme.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-screen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-shen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sql.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sqlite.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-table.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-tangle.el	diff1 \|	diff2 \|	blob \| history
lisp/ob.el	diff1 \|	diff2 \|	blob \| history
lisp/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/org-attach.el	diff1 \|	diff2 \|	blob \| history
lisp/org-bibtex.el	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-clock.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview-xemacs.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org-exp.el	diff1 \|	diff2 \|	blob \| history
lisp/org-gnus.el	diff1 \|	diff2 \|	blob \| history
lisp/org-html.el	diff1 \|	diff2 \|	blob \| history
lisp/org-list.el	diff1 \|	diff2 \|	blob \| history
lisp/org-mobile.el	diff1 \|	diff2 \|	blob \| history
lisp/org-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org-publish.el	diff1 \|	diff2 \|	blob \| history
lisp/org-table.el	diff1 \|	diff2 \|	blob \| history
lisp/org-taskjuggler.el	diff1 \|	diff2 \|	blob \| history
lisp/org-w3m.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
mk/eldo.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-emacs-lisp.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-exp.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-element.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-export.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-src.el	diff1 \|	diff2 \|	blob \| history
testing/org-test.el	diff1 \|	diff2 \|	blob \| history

Org-mode, an Emacs mode for organizing your life.

RSS Atom

contrib/lisp/htmlize.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-contacts.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-ascii.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-beamer.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-groff.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-html.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-latex.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-man.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-odt.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-publish.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-e-texinfo.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-export.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-invoice.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-md.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-mime.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-notify.el	diff1 \|	diff2 \|	blob \| history
doc/orgguide.texi	diff1 \|	diff2 \|	blob \| history
etc/schema/od-manifest-schema-v1.2-os.rnc	diff1 \|	diff2 \|	blob \| history
etc/schema/od-schema-v1.2-os.rnc	diff1 \|	diff2 \|	blob \| history
lisp/ob-C.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-R.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-awk.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-calc.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-clojure.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-comint.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ditaa.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-dot.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-emacs-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-exp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-fortran.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-gnuplot.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-haskell.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-io.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-java.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-js.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-keys.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lilypond.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-lob.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-maxima.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-mscgen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ocaml.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-octave.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-perl.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-picolisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-plantuml.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-python.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ref.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ruby.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sass.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-scala.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-scheme.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-screen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-shen.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sql.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sqlite.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-table.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-tangle.el	diff1 \|	diff2 \|	blob \| history
lisp/ob.el	diff1 \|	diff2 \|	blob \| history
lisp/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/org-attach.el	diff1 \|	diff2 \|	blob \| history
lisp/org-bibtex.el	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-clock.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview-xemacs.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org-exp.el	diff1 \|	diff2 \|	blob \| history
lisp/org-gnus.el	diff1 \|	diff2 \|	blob \| history
lisp/org-html.el	diff1 \|	diff2 \|	blob \| history
lisp/org-list.el	diff1 \|	diff2 \|	blob \| history
lisp/org-mobile.el	diff1 \|	diff2 \|	blob \| history
lisp/org-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org-publish.el	diff1 \|	diff2 \|	blob \| history
lisp/org-table.el	diff1 \|	diff2 \|	blob \| history
lisp/org-taskjuggler.el	diff1 \|	diff2 \|	blob \| history
lisp/org-w3m.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
mk/eldo.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-emacs-lisp.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-exp.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-element.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-export.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-src.el	diff1 \|	diff2 \|	blob \| history
testing/org-test.el	diff1 \|	diff2 \|	blob \| history