From 8a54707dc5cc8eb6ff1719ce0d8cde28d5356b4d Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 19 Apr 2007 16:58:19 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'data')

diff --git a/data/mime.types b/data/mime.types
index 0f76f39..a6ffcb2 100644
--- a/data/mime.types
+++ b/data/mime.types
@@ -1,2 +1,3 @@
 application/x-squeak-project	pr
 application/x-abiword		abw
+application/vnd.olpc-x-sugar	xo
--
cgit v0.9.1