Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 180fd62 3bd22fb)

commit	2a95a47c5f5b1b07ad8d9509455eb816f46075ae
author	Nicolas Goaziou <n.goaziou@gmail.com>
	Mon, 1 Oct 2012 19:37:48 +0000 (1 21:37 +0200)
committer	Nicolas Goaziou <n.goaziou@gmail.com>
	Mon, 1 Oct 2012 19:37:48 +0000 (1 21:37 +0200)
tree	c6522df49ff07b44a1bfda9308733113dfeddf00	tree \| snapshot (tar.gz zip)
parent	180fd62245df148dadf6f5c0b2f660eca3438f48	commit \| diff
parent	3bd22fb0456ff71b941b1965497df605ac1689e1	commit \| diff

Merge branch 'maint'

contrib/lisp/org-export.el	diff1 \|	diff2 \|	blob \| history
doc/org.texi	diff1 \|	diff2 \|	blob \| history
lisp/ob.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org-exp.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-element.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-export.el	diff1 \|	diff2 \|	blob \| history

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