Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	prelude/prelude-auto-install.el
This commit is contained in:
Bozhidar Batsov 2012-04-23 12:15:31 +03:00
commit 9fcc478b97

View file

@ -52,6 +52,7 @@
("\\.hs\\'" . haskell-mode) ("\\.hs\\'" . haskell-mode)
("\\.less\\'" . less-css-mode) ("\\.less\\'" . less-css-mode)
("\\.lua\\'" . lua-mode) ("\\.lua\\'" . lua-mode)
("\\.coffee\\'" . coffee-mode)
("\\.erl\\'" . erlang-mode) ("\\.erl\\'" . erlang-mode)
("\\.feature\\'" . feature-mode))) ("\\.feature\\'" . feature-mode)))