Thomas Citharel e9d4d17693 fix merge confict		2014-11-19 16:54:28 +01:00
..
3rdparty	Changing close message button to use × instead of X	2014-10-31 10:44:20 -04:00
poche	fix merge confict	2014-11-19 16:54:28 +01:00