Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-09-29 22:24:36 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-09-29 22:24:36 (GMT)
commitfa77db4cb761cf9b9a585d31bba2d3df8fda3cec (patch)
treeb342e8d60537e3853dd776019d48fa48a036a71d
parent4c5f367b4beaafa9e797bea15a6959bc1cab638b (diff)
parent01dde89c097c81d23ebab2a4900b0be8230f6b02 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
-rw-r--r--NEWS4
-rwxr-xr-xactivity/activity.info4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 900bb70..8c94d6d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+59
+
+* Add several ogg subtypes (marco)
+
57
* Fix a typo, make mime types actually work (marco)
diff --git a/activity/activity.info b/activity/activity.info
index fcf7626..d2b98d2 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
[Activity]
name = Browse
-activity_version = 57
+activity_version = 59
service_name = org.laptop.WebActivity
icon = activity-web
class = webactivity.WebActivity
-mime_types = image/png;image/gif;image/jpeg;text/html;application/xhtml+xml;application/rss+xml;application/xml;text/css;application/ogg;audio/x-wav;audio/ogg;video/ogg
+mime_types = image/png;image/gif;image/jpeg;text/html;application/xhtml+xml;application/rss+xml;application/xml;text/css;application/ogg;audio/x-wav;audio/ogg;video/ogg;audio/x-vorbis+ogg;audio/x-flac+ogg;audio/x-speex+ogg;video/x-theora+ogg;video/x-ogm+ogg