Public Git Hosting - org-mode.git/commit

commit	c41f5075acaab1631f8c458ef403c026c73a3f02
author	Bastien Guerry <bzg@altern.org>
	Sun, 5 Jan 2014 05:36:11 +0000 (5 06:36 +0100)
committer	Bastien Guerry <bzg@altern.org>
	Sun, 5 Jan 2014 05:36:11 +0000 (5 06:36 +0100)
tree	94763aaa33813296e0a86a32966bb5222b745274	tree \| snapshot (tar.gz zip)
parent	455fbca5f8d1788c1205a3f18d89a60fc30d6955	commit \| diff
parent	373767663216742a3aed15534b82121893796240	commit \| diff

Merge branch 'maint'

Conflicts:
contrib/lisp/org-favtable.el

52 files changed:

contrib/lisp/org-bibtex-extras.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-collector.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-contacts.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-mac-link.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-wikinodes.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-bibtex.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-confluence.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-groff.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-rss.el	diff1 \|	diff2 \|	blob \| history
doc/org.texi	diff1 \|	diff2 \|	blob \| history
doc/orgguide.texi	diff1 \|	diff2 \|	blob \| history
lisp/ob-C.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-R.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-clojure.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-comint.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-core.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-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ref.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ruby.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-shell.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sql.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-tangle.el	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-clock.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org-feed.el	diff1 \|	diff2 \|	blob \| history
lisp/org-footnote.el	diff1 \|	diff2 \|	blob \| history
lisp/org-inlinetask.el	diff1 \|	diff2 \|	blob \| history
lisp/org-list.el	diff1 \|	diff2 \|	blob \| history
lisp/org-macro.el	diff1 \|	diff2 \|	blob \| history
lisp/org-mobile.el	diff1 \|	diff2 \|	blob \| history
lisp/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org-src.el	diff1 \|	diff2 \|	blob \| history
lisp/org-table.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-ascii.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-latex.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-man.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-md.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-texinfo.el	diff1 \|	diff2 \|	blob \| history
lisp/ox.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-sh.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-ox.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/org-bibtex-extras.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-collector.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-contacts.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-mac-link.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/org-wikinodes.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-bibtex.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-confluence.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-groff.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-rss.el	diff1 \|	diff2 \|	blob \| history
doc/org.texi	diff1 \|	diff2 \|	blob \| history
doc/orgguide.texi	diff1 \|	diff2 \|	blob \| history
lisp/ob-C.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-R.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-clojure.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-comint.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-core.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-lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ref.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ruby.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-shell.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-sql.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-tangle.el	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-clock.el	diff1 \|	diff2 \|	blob \| history
lisp/org-colview.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org-feed.el	diff1 \|	diff2 \|	blob \| history
lisp/org-footnote.el	diff1 \|	diff2 \|	blob \| history
lisp/org-inlinetask.el	diff1 \|	diff2 \|	blob \| history
lisp/org-list.el	diff1 \|	diff2 \|	blob \| history
lisp/org-macro.el	diff1 \|	diff2 \|	blob \| history
lisp/org-mobile.el	diff1 \|	diff2 \|	blob \| history
lisp/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org-src.el	diff1 \|	diff2 \|	blob \| history
lisp/org-table.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-ascii.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-latex.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-man.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-md.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-texinfo.el	diff1 \|	diff2 \|	blob \| history
lisp/ox.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-ob-sh.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-ox.el	diff1 \|	diff2 \|	blob \| history
testing/org-test.el	diff1 \|	diff2 \|	blob \| history