{"shas":[["11df62a52d557619297cbf2add6f865fa623a472","72267be06c31ff9af2f6a4c144b8f59f4a10864e@gmx.de","Cleaned up shaders","weisseruebe"],["e30078b54517f5cdb8a521d8bf23cae00c71289e","72267be06c31ff9af2f6a4c144b8f59f4a10864e@gmx.de","Merge branch 'master' of github.com:cbou/CGE-JVR\n\nConflicts:\n\tresources/shaders/ambient.fs\n\tresources/shaders/lighting.fs\n\tresources/shaders/lighting.vs\n\tresources/shaders/zeppelinAmbient.fs\n\tresources/shaders/zeppelinAmbient.vs\n\tresources/shaders/zeppelinLighting.fs\n\tresources/shaders/zeppelinLighting.vs\n\tshaders/ambient.fs\n\tshaders/lighting.fs\n\tshaders/lighting.vs\n\tshaders_old/ambientH.fs\n\tshaders_old/ambientH.vs\n\tshaders_old/lightingH.fs\n\tshaders_old/lightingH.vs\n\tshaders_old/phong.fs\n\tshaders_old/phong.vs\n\tsrc/cge/zeppelin/Renderer.java\n\tsrc/cge/zeppelin/Skybox.java\n\tsrc/cge/zeppelin/Zeppelin.java","weisseruebe"],["7f6e7d05cf7ead9d8d11ccf38cbe5c14a7b64aa5","72267be06c31ff9af2f6a4c144b8f59f4a10864e@gmx.de","Shaders cleaned up","weisseruebe"],["d01e57a77cdd109cd9e7ca3710bcddad237bfaa4","72267be06c31ff9af2f6a4c144b8f59f4a10864e@gmx.de","Cleaned up shaders","weisseruebe"]],"ref":"refs/heads/master","size":4,"head":"d01e57a77cdd109cd9e7ca3710bcddad237bfaa4","push_id":36000774}