Merge branch '2.4.3' of ssh://git.tasktools.org/tm/task into 2.4.3

2015-03-29 17:30:06 -04:00
parent 267f054449 7a64c19641
commit 73f4f55e0a
9 changed files with 34 additions and 31 deletions
--- a/src/Duration.cpp
+++ b/src/Duration.cpp
@@ -319,6 +319,7 @@ bool Duration::parse (const std::string& input, std::string::size_type& start)
      start = original_start + n.cursor ();

      // Linear lookup - should be logarithmic.
+      double seconds = 1;
      for (unsigned int i = 0; i < NUM_DURATIONS; i++)
      {
        if (durations[i].unit == unit &&