[TAG] create 1.2-dev tag

This commit is contained in:
Edouard DUPIN 2014-06-30 22:36:36 +02:00
parent 09425067dc
commit 173e57342d

View File

@ -1 +1,5 @@
1.1.1
<<<<<<< HEAD
1.1.1
=======
1.2-dev
>>>>>>> 2939038... [TAG] create 1.2-dev tag