]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ee3d2e d5d6e45)
Merge pull request #424 from ljos/de/activate-extra-mode
authorJoão Távora <joaotavora@gmail.com>
Thu, 31 Oct 2013 13:28:26 +0000 (06:28 -0700)
committerJoão Távora <joaotavora@gmail.com>
Thu, 31 Oct 2013 13:28:26 +0000 (06:28 -0700)
Feature: de/activate-extra-mode

1  2 
yasnippet-tests.el patch | diff1 | diff2 | blob | history
yasnippet.el patch | diff1 | diff2 | blob | history

diff --cc yasnippet-tests.el
Simple merge
diff --cc yasnippet.el
Simple merge