[sugar] demo4 branch merged

[Marco Pesenti Gritti]

Dan Williams wrote:
> On Sat, 2006-08-19 at 12:03 +0200, Marco Pesenti Gritti wrote:
>   
>> Hi,
>>
>> I merged the demo4 branch, since I'm back on feature parity with master.
>> The M1 work will continue on master...
>>     
>
> Note that you likely will need to do a full sugar-jhbuild to pull in
> goocanvas.  You may also need to update the GTK icon cache for the new
> icons; to do that, based in the sugar-jhbuild directory:
>
> cd build/share/icons/olpc
> gtk-update-icon-cache -f .
>   

Hmm I didn't have to do that... Not sure how icon cache works exactly 
though so not sure why this would happen...

Marco