From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 3 Oct 2014 11:39:58 +0000 (+0200)
Subject: merge tools/parametrs.py from diadems into dev
X-Git-Tag: 0.6~4^2~30
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=730bf841db07f25bb439f15450eb3471dd9b0ea8;p=timeside.git

merge tools/parametrs.py from diadems into dev
---

diff --git a/timeside/tools/parameters.py b/timeside/tools/parameters.py
index 11503d6..3101abb 100644
--- a/timeside/tools/parameters.py
+++ b/timeside/tools/parameters.py
@@ -23,7 +23,7 @@
 
 
 from traits.api import HasTraits, Unicode, Int, Float, Range, Enum
-from traits.api import ListUnicode, List
+from traits.api import ListUnicode, List, Tuple
 from traits.api import TraitError
 
 import simplejson as json