Time  Nick  Message
06:54 nrz   hi, wait before merge the shadow mapping render pass, i want to add some comments
07:20 nrz   i'm waiting for the shadow rendered to be finished/merged. it seems a rebase failed on it, i saw some Krock commits
07:20 nrz   then i will continue slowly my work on refactoring the client
17:46 sfan5 pushing http://sprunge.us/m3BMnO?diff in a few mins
17:54 Krock I really wonder what kind of comment I made there
17:54 Krock oh "commits".
17:56 Krock indeed. there's quite some garbage inside the PR now. although doing a diff and applying that on a master/HEAD-based branch might solve it
17:58 sfan5 it'll work fine if squashed
17:58 Krock right. no conflicts reported.
20:44 sfan5 maybe we can find a second tool to run over the PR
20:44 sfan5 then it will be 100% unmergeable