On branch master

 Your branch is up to date with 'origin/master'.
 Changes to be committed:
	modified:   Makefile
 Changes not staged for commit:
	modified:   include/eosMATH.h

diff --git a/Makefile b/Makefile
index 8c194ed..e0e4a80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -330,22 +330,28 @@ git-fetch-others::
 git-merge-all:: git-merge git-merge-zephyr git-merge-data git-merge-optional git-merge-tutorial git-merge-others
 
 git-merge::
-       cd .       ; git log -1; git merge FETCH_HEAD 
+       #cd .       ; git log -1; git merge FETCH_HEAD 
+       cd .       ; git log -1; git merge 
 
 git-merge-zephyr::
-       cd zephyr  ; git log -1; git merge FETCH_HEAD 
+       #cd zephyr  ; git log -1; git merge FETCH_HEAD 
+       cd zephyr  ; git log -1; git merge 
 
 git-merge-data::
-       cd data    ; git log -1; git merge FETCH_HEAD 
+       #cd data    ; git log -1; git merge FETCH_HEAD 
+       cd data    ; git log -1; git merge 
 
 git-merge-optional::
-       cd optional; git log -1; git merge FETCH_HEAD
+       #cd optional; git log -1; git merge FETCH_HEAD
+       cd optional; git log -1; git merge 
 
 git-merge-tutorial::
-       cd tutorial; git log -1; git merge FETCH_HEAD 
+       #cd tutorial; git log -1; git merge FETCH_HEAD 
+       cd tutorial; git log -1; git merge 
 
 git-merge-others::
-       cd others  ; git log -1; git merge FETCH_HEAD 
+       #cd others  ; git log -1; git merge FETCH_HEAD 
+       cd others  ; git log -1; git merge 
 
 #
 # Nickname