[Sugar-devel] [Karma] merged master and multicanvas

[Christoph Derndorfer]

2009/9/4 Bryan Berry <bryan at olenepal.org>

> hey guys,
>
> I have merged multicanvas w/ master.
>
> KCD, i think all of your changes are in there. That said, I looked at
> chakra stage 3 and it doesn't look like what you were working on when I
> left the office this afternoon.
>
> Pls pull, then checkout master and make sure chakra is what you expect
> it to be.
>
> Let's work off master for now since our multicanvas experiment seems to
> be working nicely. I have pushed my changes to g.sl.o and deleted the
> multicanvas branch.
>

Checked out the latest changes and the Chakra seems to be fine.

Christoph

-- 
Christoph Derndorfer
co-editor, olpcnews
url: www.olpcnews.com
e-mail: christoph at olpcnews.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.sugarlabs.org/archive/sugar-devel/attachments/20090907/71905e8d/attachment.htm