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--NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index a919bcc..3b76917 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
5
===
+<<<<<<< .mine
Added 'Clear' button (alexandre)
+=======
+Modifications on selection and gelection bounds (pekayatt)
+>>>>>>> .r96
Added rainbow effect (andremossinato)
Side number for regular polygon can be choosen (alexandre)
New shape available: Heart (andremossinato)