Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPootle Translation <pootle@dev.laptop.org>2009-01-22 22:23:47 (GMT)
committer Pootle Translation <pootle@dev.laptop.org>2009-01-22 22:23:47 (GMT)
commit15a78ddc23eb105b81b5f671705a4e414d007d81 (patch)
tree6cfed9cb43ba2f1322c41427c2cc2caa28cd296c
parentcc55bced80a1b965e4c33ae7d8f736b1b47a7f2e (diff)
parentb749990cfb977934949ad3124c2206073b7257cf (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:calculate/mainline
-rw-r--r--MANIFEST6
-rw-r--r--NEWS2
-rw-r--r--activity/activity.info3
3 files changed, 9 insertions, 2 deletions
diff --git a/MANIFEST b/MANIFEST
index 3cd025a..4d9d68a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -28,6 +28,12 @@ icons/boolean-or.svg
icons/boolean-neq.svg
icons/constants-pi.svg
icons/constants-e.svg
+icons/digits-15.svg
+icons/digits-12.svg
+icons/digits-6.svg
+icons/digits-9.svg
+icons/format-exp.svg
+icons/format-sci.svg
icons/format-rad.svg
icons/format-deg.svg
icons/plot.svg
diff --git a/NEWS b/NEWS
index 488704d..27c3664 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+28
+
* Support 'real' scientific notation (#4250)
* Add switching between exponential/scientific notation
* Allow changing of number of displayed digits
diff --git a/activity/activity.info b/activity/activity.info
index e549b48..01cc919 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,8 +3,7 @@ name = Calculate
bundle_id = org.laptop.Calculate
icon = calculate
exec = sugar-activity calculate.Calculate -s
-activity_version = 26
+activity_version = 28
host_version = 1
show_launcher = yes
license = GPLv2+
-update_url = http://dev.laptop.org/~rwh/calculate