]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4be1593 13d87aa)
Sync with yasnippet/master
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 29 Aug 2013 14:24:48 +0000 (10:24 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 29 Aug 2013 14:24:48 +0000 (10:24 -0400)
1  2 
packages/yasnippet/yasnippet-tests.el patch | diff1 | diff2 | blob | history
packages/yasnippet/yasnippet.el patch | diff1 | diff2 | blob | history

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