On Wed, Jun 25, 2014 at 08:57:08PM +0800, Dirk Hohndel wrote: > On Wed, Jun 25, 2014 at 12:50:29PM +0200, Willem Ferguson wrote: > > Changes to planner ui > > > > This patch adds four heading lables to the planner UI in order to > > facilitate the > > documentation for the planner. The print button was moved in order to > > provide > > space for a Settings heading lable at the top. > > This one doesn't apply to master. > > > This arrangement is likely to be temporary and will be changed when the > > planner is in a more finalised state. The only objective with this patch > > is to provide information that will make an easy description possible in > > the user manual for V4.2 > > If you tell me the sha of the commit before this patch maybe I can merge > things and make it all work... but from the commit message / description > I'm not 100% sure what you are trying to do, anyway...
OK, I tried a three way merge with the data that's in your patch and still can't quite make it work. Can you recreate against the latest master, please? /D _______________________________________________ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface