> There are conflicts with trunk now... > > 50 - DeviceLauncherIcon.cpp > 51 + VolumeLauncherIcon.cpp > > Please, keep these in alphabetic order.
Sure, will do?
> > 2252 void OnRemoved(); > > Please, make this protected in case you need this for testing.
It needs to be public. Maybe you meant "virtual"?
« Back to merge proposal
> There are conflicts with trunk now... con.cpp con.cpp
>
> 50 - DeviceLauncherI
> 51 + VolumeLauncherI
>
> Please, keep these in alphabetic order.
Sure, will do?
>
> 2252 void OnRemoved();
>
> Please, make this protected in case you need this for testing.
It needs to be public. Maybe you meant "virtual"?