[Fluxus] merging

[Kassen]

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.pawfal.org/pipermail/fluxus-pawfal.org/attachments/20110629/014a55e3/attachment-0002.htm>