Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--activity/activity.info2
2 files changed, 3 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 3b76917..d509173 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,8 @@
-5
+6
+
===
-<<<<<<< .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)
diff --git a/activity/activity.info b/activity/activity.info
index 0d73cf1..7b0828d 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Paint
-activity_version = 5
+activity_version = 6
service_name = org.laptop.Oficina
icon = activity-rgbpaint
class = OficinaActivity.OficinaActivity