Due to GLEditor.cpp redacted and master don't want to auto-merge any more. The culprits are my "grabbing of expressions" patch and Gabor's now fix for the behaviour of the alt key under OSX. I tried one of the merge tools that Git has, but that made me end up with a directory that wouldn't compile so I think I need some help or advice.
What should I/we do with this? Yours, Kas.
