Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Dan Williams 2007-04-10 14:12:22 -04:00
commit a803b00251

2
.gitignore vendored
View File

@ -38,7 +38,6 @@ po/stamp-it
po/*.gmo po/*.gmo
sugar/__installed__.py sugar/__installed__.py
tools/sugar-setup-activity tools/sugar-setup-activity
services/presence/org.laptop.Presence.service
threadframe threadframe
config.guess config.guess
config.sub config.sub
@ -53,4 +52,5 @@ browser/stamp-sugar-marshal.c
browser/stamp-sugar-marshal.h browser/stamp-sugar-marshal.h
services/clipboard/org.laptop.Clipboard.service services/clipboard/org.laptop.Clipboard.service
services/console/org.laptop.sugar.Console.service services/console/org.laptop.sugar.Console.service
services/presence/org.laptop.Sugar.Presence.service
bin/sugar bin/sugar