Merge branch 'stable' into release

Conflicts:
	ChangeLog
	ghc-mod.cabal
	test/CheckSpec.hs
This commit is contained in:
Daniel Gröber
2014-09-12 06:43:49 +02:00
2 changed files with 1 additions and 3 deletions

View File

@@ -28,7 +28,7 @@
(< emacs-minor-version minor)))
(error "ghc-mod requires at least Emacs %d.%d" major minor)))
(defconst ghc-version "5.0.0")
(defconst ghc-version "5.1.0.0")
;; (eval-when-compile
;; (require 'haskell-mode))