[DEV] remove etk_min and etk_max & etk::Color<> interface

2014-07-03 21:03:26 +02:00
parent 4942765ccf
commit b9a1c026fa
4 changed files with 11 additions and 14 deletions
--- a/sources/tag
+++ b/sources/tag
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.1.1
-=======
-1.2-dev
->>>>>>> 2939038... [TAG] create 1.2-dev tag
+1.2-dev