Guillaume BIENKOWSKI e2e36f2d88 Merge branch 'master' into dev_sendmsg ... Conflicts: Resources/licenses.html		2014-09-10 10:09:57 +02:00
..
.gitignore	Add files to .gitignore	2012-09-11 17:58:57 +02:00
project.pbxproj	Merge branch 'master' into dev_sendmsg	2014-09-10 10:09:57 +02:00