Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamEdit.activity
diff options
context:
space:
mode:
authorOli <olivier.belanger@umontreal.ca>2007-10-31 22:12:22 (GMT)
committer Oli <olivier.belanger@umontreal.ca>2007-10-31 22:12:22 (GMT)
commit16d0b8f3995ad44e08c89e447b7d9ac174686938 (patch)
tree462764989244c468d6fedeeb46a20431c5ea3530 /TamTamEdit.activity
parent6825b133da8986f663040cd3d766990436981710 (diff)
parentd540ecfe68c8c98cf4d9a711d22582fefdfe6adf (diff)
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Conflicts: TamTamEdit.activity/NEWS
Diffstat (limited to 'TamTamEdit.activity')
-rw-r--r--TamTamEdit.activity/activity/activity.info2
1 files changed, 1 insertions, 1 deletions
diff --git a/TamTamEdit.activity/activity/activity.info b/TamTamEdit.activity/activity/activity.info
index b6cf693..51f902c 100644
--- a/TamTamEdit.activity/activity/activity.info
+++ b/TamTamEdit.activity/activity/activity.info
@@ -3,4 +3,4 @@ name = TamTamEdit
service_name = org.laptop.TamTamEdit
icon = activity-tamtamedit
class = TamTamEdit.TamTamEdit
-activity_version = 43
+activity_version = 44