[INTEGRATION] set travis build with master of ewol

Update version tag: 1.2.3
Merge branch 'dev'
2014-10-17 09:21:39 +02:00 · 2014-10-17 09:15:18 +02:00 · 2014-10-17 09:10:19 +02:00 · 2014-08-18 22:57:06 +02:00 · 2014-06-03 22:27:31 +02:00 · 2014-06-03 22:22:20 +02:00
3 changed files with 3 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ branches:
 # previous actions:
 before_script: 
  - git clone https://github.com/HeeroYui/ewol.git
-  - cd ewol; git checkout origin/dev -b dev; cd ..
+  - cd ewol; git checkout; cd ..
  - cd ewol; git submodule init; cd ..
  - cd ewol; git submodule update; cd ..

--- a/sources/tag
+++ b/sources/tag
@@ -1 +1 @@
-1.2-dev
+1.2.3
--- a/sources/tagCode
+++ b/sources/tagCode
@@ -1 +1 @@
-5
+7
Author	SHA1	Message	Date
Edouard DUPIN	149dee1020	[INTEGRATION] set travis build with master of ewol	2014-10-17 09:21:39 +02:00
Edouard DUPIN	6e3df7ef74	Update version tag: 1.2.3	2014-10-17 09:15:18 +02:00
Edouard DUPIN	fbf774174f	Merge branch 'dev'	2014-10-17 09:10:19 +02:00
Edouard DUPIN	8c3c3daf5c	Merge branch 'dev' Conflicts: sources/tag	2014-08-18 22:57:06 +02:00
Edouard DUPIN	440f4c7093	Update version tag: 1.2.0	2014-06-03 22:27:31 +02:00
Edouard DUPIN	a01d121036	Update version tag: 1.1.2	2014-06-03 22:22:20 +02:00
@@ -1 +1 @@
 .2-dev
 .2.3