diff options
author | 2015-09-08 18:53:24 -0400 | |
---|---|---|
committer | 2015-09-08 18:53:24 -0400 | |
commit | 45633a836b2ec6bd74094b13b6df0ab6b7c8e194 (patch) | |
tree | 483abe7c9923f0b9e6656d412226dac36aec1223 /linux | |
parent | 60e901aabaeab7d205da65030849056c05c8b73e (diff) |
Resoved some merge errors
Diffstat (limited to 'linux')
-rwxr-xr-x | linux/ws_main.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 16233485..8d6217c0 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -12,6 +12,7 @@ import os; import commands; import shutil; import copy; +from distutils.version import StrictVersion top = '../' out = 'build' |