]> code.delx.au - gnu-emacs-elpa/commit
delx.au / code / gnu-emacs-elpa / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: ab7d7f3 572c73d)
Update packages/yasnippet by subtree-merging from its github-based upstream
authorJoão Távora <joaotavora@gmail.com>
Mon, 7 Mar 2016 08:40:15 +0000 (08:40 +0000)
committerJoão Távora <joaotavora@gmail.com>
Mon, 7 Mar 2016 08:40:53 +0000 (08:40 +0000)
commit99834918e1d9dc8e49356fdaac0853473487806d
tree6c0387f4786d38fa255205de7a8d5b6708347f63tree
parentab7d7f3c0cad5145d6e171ff29b8443bd34706cccommit | diff
parent572c73d50b5521b4a56eae7b00ae6c7e61582e06commit | diff
Update packages/yasnippet by subtree-merging from its github-based upstream

packages/yasnippet/snippets is left untouched in GNU ELPA. The
upstream version uses a submodule pointing to a snippets repo which
lives at https://github.com/AndreaCrotti/yasnippet-snippets.git

Conflicts: packages/yasnippet/snippets
packages/yasnippet/.gitmodules diff1 | diff2 | blob | history
packages/yasnippet/yasnippet-tests.el diff1 | diff2 | blob | history
packages/yasnippet/yasnippet.el diff1 | diff2 | blob | history