Skip to content

Commit

Permalink
Merge branch 'hotfix/1.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ktekinay
ktekinay committed Jan 22, 2015
2 parents b2984e4 + b8b9337 commit 96e607b
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Kaju Admin App/Kaju Admin.xojo_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h114003
AppMenuBar=MainMenuBar
MajorVersion=1
MinorVersion=3
SubVersion=2
SubVersion=3
NonRelease=0
Release=3
InfoVersion=Kaju Admin
LongVersion=v.1.3.2
ShortVersion=1.3.2
LongVersion=v.1.3.3
ShortVersion=1.3.3
WinCompanyName=MacTechnologies Consulting
WinInternalName=
WinProductName=
Expand Down
2 changes: 1 addition & 1 deletion Kaju Classes/Kaju.xojo_code
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ Protected Module Kaju
r = r + 0.1 + ( nonRelease.Val / kDivider )
case "b"
r = r + 0.2 + ( nonRelease.Val / kDivider )
case " " // Release
else // Release
r = r + 0.4 + ( nonRelease.Val / kDivider )
end

Expand Down
24 changes: 12 additions & 12 deletions Kaju Update Test v1.kaju
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":true,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand All @@ -34,16 +34,16 @@
"AppName":"New Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand All @@ -57,16 +57,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand Down Expand Up @@ -103,16 +103,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand Down
Binary file modified Update Test Files (Upload These)/Kaju_Update_Test_Linux.zip
View file
Binary file not shown.
Binary file modified Update Test Files (Upload These)/Kaju_Update_Test_Mac.zip
View file
Binary file not shown.
Binary file modified Update Test Files (Upload These)/Kaju_Update_Test_Win.zip
View file
Binary file not shown.
26 changes: 13 additions & 13 deletions Update Test Files (Upload These)/UpdateInformation.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KAJU 6262137BFBD953ED463FE3287833FBD603F1BA9BFD0E8934CDE5054C29941092D4192DE6D46F524D2BE76DE5C0527E6A73D61B177213BFA0BAF38E1FE15B7C793700542EA762ECF6A41146904E261802753F82CB0BDF1559AC2399CA1B41B0E28DBC843B6EEAB160DA7301949122AC900080FE5887204033B9CC80CD76457D1A690D2BF90F494F0DBADDAB12B3AFC7688D7B9B067FBE669611A589527DB32DFA0DCC56A4D51EC6D945B3A8D0EEF8687A148FE22D47F6F72D1A0D238A5220773566F5DCD9CDC48ED7DBED818516C379D982A70267AAE8E294D1CE1864CF8CFB838D6357F0F7D03F2F76B2508F8025C65E299A7179576657C49F5474C4709AEB4E
KAJU 492CF16928C03DBB8732E4F0E5396BF91A109B6192BD67D29F24C868A1B7A1872427C95ACB1122881754271033242EA390BAB71047323D919B81D0D9E509A394917F48E6B91D2A7B956969017EDC50F098A9FA82E67D0A3C3044F6E4A2C6678135173DD7076C80730D6AD275E68E9AB3100F4BECE477AE107882A35656153A26B632F097216B1625560A7801106FAEED300B452F22301764336A5C7123E11709A6FDB607DA306CFDA0D9F394A9BA61E2308478B9BA0CED06AE65F1562FE050D8A59A69A49C25375C557CA814C220B36A76AD342EB3A628198C2995613FA5A639F8FF64622917C738A0D249ED77DE6157E58F9A9FA5FA41835BFD383E28203996
[
{
"Version":"1.1 (10)",
Expand All @@ -9,16 +9,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":true,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand All @@ -32,16 +32,16 @@
"AppName":"New Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand All @@ -55,16 +55,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand Down Expand Up @@ -101,16 +101,16 @@
"AppName":"Kaju Update Test",
"RequiresPayment":false,
"MacBinary":{
"Hash":"1FCECD7DF54983766A86E4404C957228",
"Hash":"BFE30DC356D2E07B3D374F2F52488E11",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
},
"WindowsBinary":{
"Hash":"62E7207C59B7AD28B4C255C5AA7B3FDB",
"Hash":"9FC851106F43834D337E4BA3ED214828",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
"ExecutableName":"Kaju Update Test.exe"
},
"LinuxBinary":{
"Hash":"B007335E883B9A749F5F1EDEDF373B65",
"Hash":"434BF5B763B5674305D7F6C2401DC9C8",
"URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
"ExecutableName":"Kaju Update Test"
}
Expand Down

0 comments on commit 96e607b

Please sign in to comment.