Esteban Lombeyda bab09b71a2 Conflicts were from code removed		2014-05-08 13:48:25 +02:00
..
Debian	…
Linux	…
MacOSX/Bundle	…
Windows	Conflicts were from code removed	2014-05-08 13:48:25 +02:00
travisCI	…
release.sh	…