Merge branch 'next-gen' of https://github.com/manuelcortez/twblue into next-gen

This commit is contained in:
Iván Novegil 2016-01-20 21:11:33 +01:00
commit e3e4fa42db
2 changed files with 3 additions and 3 deletions

View File

@ -35,8 +35,8 @@ Although most dependencies can be found in the windows-dependencies directory, w
* [Python,](http://python.org) version 2.7.11
If you want to build both x86 and x64 binaries, you can install python x86 to C:\python27 and python x64 to C:\python27x64, for example.
* [wxPython](http://www.wxpython.org) for Python 2.7, version 3.0.2.0
* [Python windows extensions (pywin32)](http://www.sourceforge.net/projects/pywin32/) for python 2.7, build 219
* [Pycurl](http://pycurl.sourceforge.net) 7.19.5.3 for Python 2.7: [downloads](https://pypi.python.org/pypi/pycurl/7.19.5.3)
* [Python windows extensions (pywin32)](http://www.sourceforge.net/projects/pywin32/) for python 2.7, build 220
* [Pycurl](http://pycurl.sourceforge.net) 7.21.5 for Python 2.7: [downloads](https://pypi.python.org/pypi/pycurl/7.21.5)
* [PyEnchant,](http://pythonhosted.org/pyenchant/) version 1.6.6.
x64 version has been built by TWBlue developers, so you only will find it in windows-dependencies folder

@ -1 +1 @@
Subproject commit baa04ec845383aebe6aacb3931ed1bb01da53dee
Subproject commit 1262334506fe0a0f4fef47a5914acd8233e72485