From 08e1bc0ceb1e0e91ace4c7633beff14310e078e5 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Mon, 27 Aug 2007 13:40:23 +0000
Subject:  Release version 16.

---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 153415f..0497d99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
+16
+
+<<<<<<< HEAD/NEWS
 * Fix icon and roundbox changes in sugar (morgs)
 
+=======
+* Add greek translation (simosx)
+* Add arabic translation (khaled)
+
+>>>>>>> 2595c9996dfb42180c68bd75a27118f1693e561c/NEWS
 15
 
 * Rename buddy icon (morgs)
--
cgit v0.9.1