Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5ec3181 9dac001)

commit	fffd055ac5e920e744e350a1ad164494aec9fa91
author	Nicolas Goaziou <n.goaziou@gmail.com>
	Thu, 17 Apr 2014 09:34:54 +0000 (17 11:34 +0200)
committer	Nicolas Goaziou <n.goaziou@gmail.com>
	Thu, 17 Apr 2014 09:34:54 +0000 (17 11:34 +0200)
tree	b76e7258e4ae3c5e7bb419d57cf7b201493f1fb1	tree \| snapshot (tar.gz zip)
parent	5ec31814f934b65c8071b320a3fd567b351e0e8f	commit \| diff
parent	9dac00129d5ab939bc535e9dc42b8243f1fc710f	commit \| diff

Merge branch 'maint'

Conflicts:
lisp/org-element.el
lisp/ox-html.el

contrib/lisp/ox-deck.el	diff1 \|	diff2 \|	blob \| history
contrib/lisp/ox-groff.el	diff1 \|	diff2 \|	blob \| history
lisp/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-html.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-latex.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-man.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-md.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-texinfo.el	diff1 \|	diff2 \|	blob \| history
testing/lisp/test-org-element.el	diff1 \|	diff2 \|	blob \| history

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