[Uml-devel] umbrello soc 2011 compile failure

[Jonathan Riddell]

On Tue, Jul 26, 2011 at 10:50:10AM +0100, Jonathan Riddell wrote:
> On Mon, Jul 25, 2011 at 02:59:16PM -0700, Kip Warner wrote:
> > On Mon, 2011-07-25 at 22:52 +0100, Jonathan Riddell wrote:
> > > I'm getting a compile failure in the soc-umbrello-2011 branch but it's
> > > not in a part of the code Camilla has touched, does anyone know why?
> > 
> > Just out of curiosity, when is the soc branch scheduled to be merged
> > with mainline?
> 
> When it's ready.  Not likely if I can't even compile it :(

After discussing with Camila it compiles with a simple checkout of
branch,I was checking out kdesdk then replacing the umbrello directory
with her branch.  I'm not sure what the difference is but it's not too
important if Camila does a fresh branch from trunk and merges into
that.

Jonathan