deed 520b8d1bb9 Merge remote-tracking branch 'upstream/develop' into ryzomcore		2019-05-05 16:50:36 +02:00
..
cfg	Changed: replace c++11 code	2017-03-15 17:43:49 +02:00
data	Merge remote-tracking branch 'hg/develop/hg/develop' into ryzomcore	2019-04-16 21:28:45 +02:00
macosx	Merge branch 'ryzomcore' into feature/merge_ryzomcore170417	2017-03-20 17:43:51 +01:00
src	Merge remote-tracking branch 'upstream/develop' into ryzomcore	2019-05-05 16:50:36 +02:00
unix	Merge branch 'ryzomcore' into feature/merge_ryzomcore170417	2017-03-20 17:43:51 +01:00
windows	correction pour la compilation sous windows à cause des merges RC mal fait	2018-03-25 12:04:43 +02:00
client.cfg	Changed: replace c++11 code	2017-03-15 17:43:49 +02:00
client_default.cfg	Merge remote-tracking branch 'hg/develop/hg/develop' into ryzomcore	2019-04-16 21:28:45 +02:00
CMakeLists.txt	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00