Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c8a3ab1 b347277)

commit	e44524b3b2346743e17c8cfa3a7c6bf0ea44505f
author	Kyle Meyer <kyle@kyleam.com>
	Thu, 4 Feb 2016 04:37:26 +0000 (3 23:37 -0500)
committer	Kyle Meyer <kyle@kyleam.com>
	Thu, 4 Feb 2016 04:37:26 +0000 (3 23:37 -0500)
tree	f752d0cf2e4907f71a695e6707d6cd579f6f4778	tree \| snapshot (tar.gz zip)
parent	c8a3ab1e4c02ca3bbbfd2fd20dbb091b91f4c1bc	commit \| diff
parent	b347277ba0242ab75e9ffbd1245c7bef677d2565	commit \| diff

Merge branch 'maint'

doc/org.texi	diff1 \|	diff2 \|	blob \| history
lisp/ob-C.el	diff1 \|	diff2 \|	blob \| history
lisp/ob-fortran.el	diff1 \|	diff2 \|	blob \| history
lisp/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history

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