Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 49ef9d0 6f9184a)

commit	0d0d0ad56e897192c3933c963c7ff67fa37adc2d
author	Bastien <bzg@gnu.org>
	Tue, 4 Aug 2015 23:01:46 +0000 (5 01:01 +0200)
committer	Bastien <bzg@gnu.org>
	Tue, 4 Aug 2015 23:01:46 +0000 (5 01:01 +0200)
tree	a281c9b5c5dc5ec4b0bc8ff034ebe29f46f820da	tree \| snapshot (tar.gz zip)
parent	49ef9d02a21d398764c9779b90d1ffdd089f4e1f	commit \| diff
parent	6f9184a294e4e7914041c2ae42ef147d11e9ebec	commit \| diff

Merge branch 'backport-master'

Conflicts:
lisp/org-table.el

doc/org.texi	diff1 \|	diff2 \|	blob \| history
lisp/org-capture.el	diff1 \|	diff2 \|	blob \| history
lisp/org-timer.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history
lisp/ox.el	diff1 \|	diff2 \|	blob \| history

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