Merge remote-tracking branch 'upstream/master'

Conflicts:
	recipes/powershell
This commit is contained in:
Ralph Moritz 2012-07-10 11:56:11 +02:00
commit 3b826c0436
4 changed files with 6 additions and 1 deletions

3
recipes/backup-walker Normal file
View file

@ -0,0 +1,3 @@
(backup-walker
:fetcher github
:repo lewang/backup-walker)

1
recipes/google-this Normal file
View file

@ -0,0 +1 @@
(google-this :repo "Bruce-Connor/emacs-google-this" :fetcher github)

View file

@ -1 +1 @@
(powershell :repo "ralmoritz/powershell.el" :fetcher github)
(powershell :fetcher wiki :files ("Powershell.el"))

1
recipes/typing Normal file
View file

@ -0,0 +1 @@
(typing :fetcher wiki)