Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: eccd704 fa1a61c)

commit	6f9184a294e4e7914041c2ae42ef147d11e9ebec
author	Kyle Meyer <kyle@kyleam.com>
	Mon, 27 Jul 2015 03:56:50 +0000 (26 23:56 -0400)
committer	Kyle Meyer <kyle@kyleam.com>
	Mon, 27 Jul 2015 03:56:50 +0000 (26 23:56 -0400)
tree	9c5c90f505cc5e24049c58f9bb42182ff5480d67	tree \| snapshot (tar.gz zip)
parent	eccd704aea3c762140786063d6e8ca6f23969d5d	commit \| diff
parent	fa1a61c2efce905e5d83d4322c44ec9cd8b3b183	commit \| diff

Merge branch 'maint' into backport-master

23 files changed:

doc/org.texi	diff1 \|	diff2 \|	blob \| history
lisp/ob-core.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-ruby.el	diff1 \|	diff2 \|	blob \| history
lisp/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/org-archive.el	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-clock.el	diff1 \|	diff2 \|	blob \| history
lisp/org-compat.el	diff1 \|	diff2 \|	blob \| history
lisp/org-gnus.el	diff1 \|	diff2 \|	blob \| history
lisp/org-macs.el	diff1 \|	diff2 \|	blob \| history
lisp/org-mouse.el	diff1 \|	diff2 \|	blob \| history
lisp/org-src.el	diff1 \|	diff2 \|	blob \| history
lisp/org-table.el	diff1 \|	diff2 \|	blob \| history
lisp/org-timer.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-ascii.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-icalendar.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-publish.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-texinfo.el	diff1 \|	diff2 \|	blob \| history
lisp/ox.el	diff1 \|	diff2 \|	blob \| history

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