Quote:
Originally Posted by cc_
But the main conflict is the whole of the OSX prompt handling stuff, I started it, oli took mine and modded it, tale took oli's and modded it then I took bits of tales and added it back into mine! Mine does more than tale's (Combo boxes, editable text field), so I couldn't use his stuff directly.
|
I have added the combo box to my Carbon code just before I switched to Git, so it should be in there now. No editable text field though.
Quote:
Originally Posted by cc_
I'm not sure the best way forward from here.
|
Well, I guess could merge my branch with WDL's "next" branch, and then try to merge your editable text field code into it.