I've merged a big patch from AOKP to RC that reformats their code by AOSP guide lines and it didn't merged very nice
So I hope I solved merge conflicts the right way!
Builders should test RC if it FCs on some menu/option..
also this has been added:
Settings: Add triggers to change profile based on Wifi AP - CM
ROMControl: GlowPad Torch (NavRing) - AOKP
ROMControl: Collapse Shade TogglePref - AOKP
Syncing and building right now. Will report back when done.
Finally can create my own builds! That took alot of time.
Btw: Ccache on by default if installed?