MAPClient

Merge lp:mapclient/workspace into lp:mapclient/testing

  1. workspace
  2. Merge into testing
Proposed by Hugh Sorby
Status: Merged
Approved by: Hugh Sorby
Approved revision: 23
Merged at revision: 5
Proposed branch: lp:mapclient/workspace
Merge into: lp:mapclient/testing
Diff against target: 25 lines (+2/-2)
2 files modified
src/core/PluginFramework.py (+1/-1)
src/settings/Info.py (+1/-1)
To merge this branch: bzr merge lp:mapclient/workspace
Reviewer Review Type Date Requested Status
Hugh Sorby Pending
Review via email: mp+105734@code.launchpad.net

Description of the change

Bug fix for python 2.6.1

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/PluginFramework.py'
2--- src/core/PluginFramework.py 2012-05-11 04:14:03 +0000
3+++ src/core/PluginFramework.py 2012-05-14 22:47:19 +0000
4@@ -80,7 +80,7 @@
5 moduleAuthor = '?'
6 if hasattr(module, '__author__'):
7 moduleAuthor = module.__author__
8- print("Plugin '{}' ver {} by {} loaded".format(pluginName, moduleVersion, moduleAuthor))
9+ print("Plugin '{0}' ver {1} by {2} loaded".format(pluginName, moduleVersion, moduleAuthor))
10 loaded_plugins[pluginName] = module
11
12 try:
13
14=== modified file 'src/settings/Info.py'
15--- src/settings/Info.py 2012-05-08 03:05:49 +0000
16+++ src/settings/Info.py 2012-05-14 22:47:19 +0000
17@@ -19,7 +19,7 @@
18 '''
19 VERSION_MAJOR = 0
20 VERSION_MINOR = 2
21-VERSION_PATCH = 0
22+VERSION_PATCH = 1
23 VERSION_STRING = str(VERSION_MAJOR) + "." + str(VERSION_MINOR) + "." + str(VERSION_PATCH)
24 GPL_VERSION = '3'
25 APPLICATION_NAME = 'MAP Client'

Subscribers

People subscribed via source and target branches

to all changes: