ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

On Wed, 2010-10-13 at 12:41 +0000, Michael Terry wrote:
> I updated EXTRA_DIST

Cool.

> , but I'm not entirely sure what's going on with dbus-properties-client.h.OTHER.  My previous commits made a small change to dbus-properties-client.h:
> 
> -  GValue OUT_Value = {0};
> +  GValue OUT_Value = { 0, };
> 
> That seemed to be done automatically by dbus-binding-tool, so I left it.  I don't have OTHER in my tree.  I think LP is showing it because there is a conflict in the .h file in my tree vs trunk.  That can be resolved when merging.

Okay.  I deleted it because it was generated and shouldn't have been in
version control.  Because you changed it Bazaar is bringing up the fact
that the change can't be merged in because the file doesn't exist.

-- 
https://code.launchpad.net/~mterry/indicator-application/gtk3/+merge/27990
Your team ayatana-commits is subscribed to branch lp:indicator-application.