Merge branch 'torwin' of dan/ui into master
This commit is contained in:
commit
dd1df6f916
|
@ -53,6 +53,7 @@ pipeline:
|
|||
- find -iname 'rcc*' | xargs rm
|
||||
- go get -d
|
||||
- qtdeploy build windows
|
||||
- cp windows/* deploy/windows
|
||||
- zip -r deploy/cwtch-windows-`date +%G-%m-%d-%H-%M`.zip deploy/windows
|
||||
deploy-buildfiles:
|
||||
image: pivotaldata/concourse-ssh
|
||||
|
|
|
@ -5,4 +5,3 @@ rcc*
|
|||
*.qmlc
|
||||
*.jsc
|
||||
vendor/
|
||||
tor/
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,5 @@
|
|||
SOCKSPort 9050
|
||||
ControlPort 9051
|
||||
CookieAuthentication 0
|
||||
# Needed for integ tests
|
||||
RunAsDaemon 0
|
Binary file not shown.
Reference in New Issue