Merging in dev

rolkar · May 17, 2015 · f43e7cc · f43e7cc
2 parents 8d5d88f + c1305c5
commit f43e7cc
Show file tree

Hide file tree

Showing 2 changed files with 233 additions and 111 deletions.
diff --git a/src/makefile b/src/makefile
@@ -1,6 +1,7 @@
 # MAKEFILE
 #
-# Copyright (c) 2010 - Roland Karlsson ([email protected])
+# Copyright (c) 2010-2015
+# Roland Karlsson ([email protected])
 # BSD-style - see doc/copyright.txt
 
 # -----------------------------------------------------------