Mercurial Mercurial > platform / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct merge for audio record annotation and update version number to 1.49.2 V01.49.02
authorcavaliet
Wed, 15 May 2013 12:18:24 +0200
changeset 1185 c0a7d3cee89f
parent 1184 f305d9a7d0b1
child 1186 3fb6b550840c
correct merge for audio record annotation and update version number to 1.49.2
src/ldt/ldt/__init__.py file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/views/lignesdetemps.py file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/__init__.py	Tue May 14 12:05:36 2013 +0200
+++ b/src/ldt/ldt/__init__.py	Wed May 15 12:18:24 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (1, 49, 1, "final", 0)
+VERSION = (1, 49, 2, "final", 0)
 
 
 def get_version():
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Tue May 14 12:05:36 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Wed May 15 12:18:24 2013 +0200
@@ -218,7 +218,7 @@
     return render_to_response(template_path,
                               {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code,
                                 'baseurl': baseurl, 'url': urlStr, 'posturl': posturl,
-                                'id': id, 'readonly': readonly},
+                                'id': id, 'readonly': readonly, 'audio_record_url': audio_record_url},
                               context_instance=RequestContext(request))
platform