diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-27 20:34:08 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-27 20:34:08 -0400 |
| commit | 593b004ae97b501b8512bb822a22f417b9285d88 (patch) | |
| tree | ebf6d229394e4adfe5d444540114910257d4650c /pkg | |
| parent | d2806583ead2712c9095b82f31b50924dfc80411 (diff) | |
| parent | 64e4a8e4d5ed26014e8542d73a6bc989b8666598 (diff) | |
Merge branch 'develop' into debian/experimental
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/next-version | 2 | ||||
| -rw-r--r-- | pkg/pyinst/pyinst-build.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkg/next-version b/pkg/next-version index 3d4f0a85..29a0f215 100644 --- a/pkg/next-version +++ b/pkg/next-version @@ -1 +1 @@ -0.9.2.rc1 +0.9.2.rc2 diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk index 3c514a02..664f13ec 100644 --- a/pkg/pyinst/pyinst-build.mk +++ b/pkg/pyinst/pyinst-build.mk @@ -22,7 +22,6 @@ reset-ver: pyinst-hacks-linux: # XXX this should be taken care of by pyinstaller data collector - #cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST) cp ../leap_common/src/leap/common/cacert.pem $(DIST) mkdir -p $(DIST)pysqlcipher mkdir -p $(DIST)pixelated |