##// END OF EJS Templates
merge with beta
marcink -
r2778:23851216 merge default
parent child Browse files
Show More
@@ -17,4 +17,4 b' docutils==0.8.1'
17 simplejson==2.5.2
17 simplejson==2.5.2
18 mock
18 mock
19 py-bcrypt
19 py-bcrypt
20 mercurial>=2.3.0,<2.4 No newline at end of file
20 mercurial==2.3.0 No newline at end of file
@@ -60,10 +60,10 b' if sys.version_info < (2, 7):'
60 requirements.append("unittest2")
60 requirements.append("unittest2")
61
61
62 if is_windows:
62 if is_windows:
63 requirements.append("mercurial>=2.3.0,<2.4")
63 requirements.append("mercurial==2.3.0")
64 else:
64 else:
65 requirements.append("py-bcrypt")
65 requirements.append("py-bcrypt")
66 requirements.append("mercurial>=2.3.0,<2.4")
66 requirements.append("mercurial==2.3.0")
67
67
68
68
69 dependency_links = [
69 dependency_links = [
General Comments 0
You need to be logged in to leave comments. Login now