From 3b339eec82dee31d697daa6a2d5e692c6b5b372b Mon Sep 17 00:00:00 2001
From: Sebastian Silva <sebastian@sugarlabs.org>
Date: Sat, 30 Jul 2011 05:46:54 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/screencast/screencast

Conflicts:
	activity/screencast-icon.svg
	pippy_app.py
---
diff --git a/NEWS b/NEWS
index f702a27..be40a4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+3
+
+*Fix for olpcau-#792 friendler journal name (seabstian silva sebastian@somosazucar.org)
+*adding git ignore (sebastian silva sebastian@somosazucar.org)
+
 2
 
 *New icon
diff --git a/activity/activity.info b/activity/activity.info
index e40af2b..3e033ca 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,5 +4,5 @@ bundle_id = org.laptop.Screencast
 service_name = org.laptop.Screencast
 class = pippy_app.ScreencastActivity
 icon = screencast-icon
-activity_version = 2
+activity_version = 3
 show_launcher = yes
diff --git a/activity/screencast-icon.svg b/activity/screencast-icon.svg
index 43ddba7..c2b487c 100644
--- a/activity/screencast-icon.svg
+++ b/activity/screencast-icon.svg
@@ -11,6 +11,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg2"
diff --git a/pippy_app.py b/pippy_app.py
index 6e07cce..5cbde7d 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -95,7 +95,6 @@ class ScreencastActivity(ViewSourceActivity):
 
         # Status label.
         self.status = gtk.Label(_("Status: Stopped"))
-        
         hbox.pack_start(self.record, expand=False, padding=40)
         hbox.pack_start(self.stop, expand=False, padding=40)
 
--
cgit v0.9.1