Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 69b22b6 1fbc7a4)

commit	c3d67b3556c8184cdaf2e8ac999acc702e9d2c5f
author	Kyle Meyer <kyle@kyleam.com>
	Wed, 18 Jan 2017 02:22:11 +0000 (17 21:22 -0500)
committer	Kyle Meyer <kyle@kyleam.com>
	Wed, 18 Jan 2017 02:22:11 +0000 (17 21:22 -0500)
tree	f5d5699d7b7c475c85b27a2b6034e5785c7f7013	tree \| snapshot (tar.gz zip)
parent	69b22b6590357ab0bdd8a90793b2322d4a789bbd	commit \| diff
parent	1fbc7a424f703f86235c4c5b30caab6604b8feb7	commit \| diff

Merge branch 'maint'

lisp/org.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org.el	diff1 \|	diff2 \|	blob \| history

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