Merge: gamnit: intro textures, programs, camera and the globe example
[nit.git] / tests / base_conflict_submodule_name_submodule1 /
2011-04-02 Jean Privatcompile: cnames for classes and modules