{"shas":[["5d3c11894bf953bfc95493b0428951fff0f220d1","a54b2e5cfe3b4e8571b576458420fd80529cd36b@gmail.com","Initial merge of crimson changes","Christopher Kohnert"],["ca9202accbd5d92a2a746064164ee6d80eabb87d","cbb7353e6d953ef360baf960c122346276c6e320@ziplinegames.com","merged in gl-refactor","Patrick Meehan"],["97e64f9906ba0cab377a011e81099117b63a18d2","cbb7353e6d953ef360baf960c122346276c6e320@ziplinegames.com","fixed anim-basic sample","Patrick Meehan"],["5848c3657d23d653b679896a79658b2a919f1520","27fd8c1642a804ddd64f8737bef8b1db6753076e@gmail.com","added android support. load sounds into memory by default","Robert Dalton"],["2aaf526505d802d6d2adffd89d9f68b7b7982a13","27fd8c1642a804ddd64f8737bef8b1db6753076e@gmail.com","Merge branch 'master' of github.com:moai/moai-dev","Robert Dalton"],["a764ffe6322e65610af5ecfabc6cd7ead9eba126","96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@ziplinegames.com"," fixed the ios and osx build","Eric Edelman"],["bfd318e09acc3daf8f3e9eccf4dc504036019b87","96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@ziplinegames.com","'fixed' the windows builds...","Eric Edelman"],["14b0ac33dc759ca12132152ec213675542e26ff3","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","fixed header search paths to match in all configurations","joshlytle"],["8830ac2f2d67fad79b85d57151a1a7ecf9f1bef7","cbb7353e6d953ef360baf960c122346276c6e320@ziplinegames.com","hack for remapping frame buffer glew api","Patrick Meehan"],["b4d63124c9dfc2a7f2ede7267440eff3c3bbbd85","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","Merge branch 'master' of github.com:moai/moai-dev","joshlytle"],["1c572e1eee52a73aa6a50beb386f2ce53319e830","cbb7353e6d953ef360baf960c122346276c6e320@ziplinegames.com","fixed box 2d debug drawing transform error","Patrick Meehan"],["ac47094a3fe747d1643afec12522395871e398b7","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","Merge branch 'master' of github.com:moai/moai-dev","joshlytle"],["67d9398a8b7f33a1dd48cead91b50bd4c45ed324","27fd8c1642a804ddd64f8737bef8b1db6753076e@gmail.com","fixed merge conflicts for untz","Robert Dalton"],["95c4e5667d657d9e5b40c8c503548b52dac91783","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","Merge branch 'master' of github.com:moai/moai-dev","joshlytle"],["3b3b8876a39bcd13d3b6facaacb77f16d3653c6b","cbb7353e6d953ef360baf960c122346276c6e320@ziplinegames.com","added partition results buffer and shared instance of the same; reworked MOAIPartition to return results to MOAIPartitionResultBuffer; removed upper limit on renderables from MOAILayer2D","Patrick Meehan"],["eca79518b3a69836742de314bec12dc44a7d3309","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","Merge branch 'master' of github.com:moai/moai-dev\n\nConflicts:\n\tvs2008/moaicore/moaicore.vcproj","joshlytle"],["ec9d078b18ca7a1a90ce3751ea9ad7f9894be49f","c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@ziplinegames.com","fixing build","joshlytle"],["c9f683d640cd22be275d77b8f336ed157ec6003f","a54b2e5cfe3b4e8571b576458420fd80529cd36b@gmail.com","Post merge cleanups and mis-merge fixes.","Christopher Kohnert"],["121ab7951b66e6ba42273c1800f6fc9e33c49f85","96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@ziplinegames.com","fixed a borken build","Eric Edelman"],["418280f3a6fa22d2bdc6e0d53616f4cf3c40fceb","96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@ziplinegames.com","build updates - android still broken - vs2010 fixed","Eric Edelman"]],"ref":"refs/heads/gl-refactor","size":89,"head":"16fa9975b06b65d96c320c6d39a1b6733eb2f0a9","push_id":41031708}