Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS8
1 files changed, 8 insertions, 0 deletions
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)