AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of https://github.com/akshayaurora/electrum into akshayaurora-master

Browse Source 
Conflicts:
	gui/kivy/tools/buildozer.spec
This commit is contained in:
ThomasV
2015-10-13 12:24:27 +02:00
parent 7f4f32663b 29b66e1279
commit 778ba23fbe
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/kivy/tools/buildozer.spec
View File

@@ -90,7 +90,7 @@ android.add_jars = lib/android/zbar.jar
# (str) python-for-android branch to use, if not master, useful to try
# not yet merged features.
# android.branch = master
#android.branch = master
# (str) OUYA Console category. Should be one of GAME or APP
# If you leave this blank, OUYA support will not be enabled