From af79e35cdb77e06068f8a3900b1f90e96c370819 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 16 Jun 2006 13:17:26 -0400 Subject: [PATCH 1/2] Test commit --- .gitignore | 1 + README | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..0d20b648 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/README b/README index e59ac490..937f29c5 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Dependencies ============ - + xulrunner gecko-embed From e633c2ef8d803397808b467b6854a39d0fb66f7f Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 16 Jun 2006 13:21:28 -0400 Subject: [PATCH 2/2] Missing import --- sugar/browser/BrowserActivity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sugar/browser/BrowserActivity.py b/sugar/browser/BrowserActivity.py index 9a82208f..e5e6ce7f 100644 --- a/sugar/browser/BrowserActivity.py +++ b/sugar/browser/BrowserActivity.py @@ -9,7 +9,7 @@ from sugar.shell import activity from sugar.browser import NotificationBar from sugar.browser import NavigationToolbar from sugar.presence.PresenceService import PresenceService - +from sugar.p2p.model.LocalModel import LocalModel _BROWSER_ACTIVITY_TYPE = "_web_olpc._udp" _SERVICE_URI_TAG = "URI"