diff options
| author | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
| commit | db704eecf513fcc48365844523557d6edab28293 (patch) | |
| tree | f37516c86c5d77f23f7e57d80ee4c39b3b651c3e /README.txt | |
| parent | add7973b3d1633b2776cb90f237415c6cac65d99 (diff) | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
Merge branch 'develop' into feature/systray-menu
Conflicts:
src/leap/app.py
Diffstat (limited to 'README.txt')
| -rw-r--r-- | README.txt | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -19,7 +19,7 @@ Dependencies If you are on a debian-based system, you can run: -apt-get install python-qt4 python-qt4-doc pyqt4-dev-tools python-gnutls python-setuptools python-nose +apt-get install python-qt4 python-qt4-doc pyqt4-dev-tools python-gnutls libgnutls-dev python-setuptools python-nose Install --------------- @@ -87,7 +87,8 @@ Hack (recommended) virtualenv . # ensure your .gitignore knows about it -bin/activate +source bin/activate +git checkout develop pkg/postmkvenv.sh python setup.py develop |