mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'HotFix_0.4.8.1' into Development

Browse source 
Conflicts:
	common/pom.xml
	common/src/main/java/io/bitsquare/app/Version.java
	core/pom.xml
	core/src/main/java/io/bitsquare/user/User.java
	gui/pom.xml
	jsocks/pom.xml
	jtorctl/pom.xml
	jtorproxy/pom.xml
	network/pom.xml
	package/linux/create_32bit_app.sh
	package/linux/create_64bit_app.sh
	package/mac/create_app.sh
	package/mac/finalize.sh
	package/windows/Bitsquare.iss
	package/windows/create_32bit_app.bat
	package/windows/create_64bit_app.bat
	pom.xml
	seednode/pom.xml
This commit is contained in:
Manfred Karrer 2016-07-05 14:52:24 +02:00
commit 6fc2ac3cf3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/linux/create_64bit_app.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
cd ../../ cd ../../
mkdir -p gui/deploy mkdir -p gui/deploy

2
package/windows/create_64bit_app.bat
View file

@ -1,4 +1,4 @@
:: edit iss file -> AppVersion :: edit iss file -> AppVersion
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion and -srcfiles :: edit -> -BappVersion and -srcfiles