Public Git Hosting - org-mode.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 9f3bed3 a2a5c8f)

commit	0cdf2eb7ce71c465e7391288fb7da6970b7bf80f
author	Nicolas Goaziou <n.goaziou@gmail.com>
	Fri, 12 Jul 2013 07:10:26 +0000 (12 09:10 +0200)
committer	Nicolas Goaziou <n.goaziou@gmail.com>
	Fri, 12 Jul 2013 07:10:26 +0000 (12 09:10 +0200)
tree	224484096a4fd0298baff45997a0841101fd992a	tree \| snapshot (tar.gz zip)
parent	9f3bed367b50a9bc218febeb21448c64892d3175	commit \| diff
parent	a2a5c8fd5bc39d333c23d7262732cd1529cc005a	commit \| diff

Merge branch 'maint'

Conflicts:
contrib/lisp/ox-koma-letter.el

contrib/lisp/ox-koma-letter.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-beamer.el	diff1 \|	diff2 \|	blob \| history
lisp/ox-latex.el	diff1 \|	diff2 \|	blob \| history

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