Merge branch 'develop'

nlamirault · Oct 9, 2015 · 0e919a2 · 0e919a2
2 parents 06340a3 + 9ef64d5
commit 0e919a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # gotest.el ChangeLog
 
+# Version 0.5.0 (10/09/2015)
+
+- #PR15: Specify minimum Emacs version
+
 # Version 0.4.0 (09/17/2015)
 
 - Migrate to CircleCI for continuous integration

diff --git a/Makefile b/Makefile
@@ -48,7 +48,6 @@ help:
 
 init:
 	@echo -e "$(OK_COLOR)[$(APP)] Initialize environment$(NO_COLOR)"
-        @echo -e "Emacs version : $(EMACS) --version"
 	@$(CASK) --dev install
 
 elpa:
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ help: @@
     init:
     	@echo -e "$(OK_COLOR)[$(APP)] Initialize environment$(NO_COLOR)"
-            @echo -e "Emacs version : $(EMACS) --version"
     	@$(CASK) --dev install
     elpa:
@@ Expand Down @@