Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: bdaf5da 2faaacf)

commit	259656a76ea24ec1610373ae257dfcba434260d5
author	Nicolas Goaziou <mail@nicolasgoaziou.fr>
	Sun, 3 Dec 2017 08:03:37 +0000 (3 09:03 +0100)
committer	Nicolas Goaziou <mail@nicolasgoaziou.fr>
	Sun, 3 Dec 2017 08:03:37 +0000 (3 09:03 +0100)
tree	5e33ab4cd06262411d9fad4f4a4c08d65c37ee9f	tree \| snapshot (tar.gz zip)
parent	bdaf5dacf44c3816c4d1d4ecbd9d3fabff317c3d	commit \| diff
parent	2faaacfeeb5d8544f5cf68279fe8c0492b867774	commit \| diff

Merge branch 'maint'

etc/ORG-NEWS	diff1 \|	diff2 \|	blob \| history
lisp/org-colview.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-colview.el	diff1 \|	diff2 \|	blob \| history

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