diff options
4 files changed, 5 insertions, 1 deletions
diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs index 7e0c7507b..7dc0d497f 100644 --- a/Assistant/Install/AutoStart.hs +++ b/Assistant/Install/AutoStart.hs @@ -14,6 +14,7 @@ import Utility.FreeDesktop import Utility.OSX import Utility.Path import System.Directory +import System.Path #endif installAutoStart :: FilePath -> FilePath -> IO () diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index d7fb373c8..411121568 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -32,7 +32,7 @@ signingKey = "89C809CB" autobuilds :: [(URLString, FilePath)] autobuilds = (map linuxarch ["i386", "amd64", "armel"]) ++ - (map androidversion ["4.0", "4.3"]) ++ + (map androidversion ["4.0", "4.3", "5.0"]) ++ [ (autobuild "x86_64-apple-yosemite/git-annex.dmg", "git-annex/OSX/current/10.10_Yosemite/git-annex.dmg") , (autobuild "windows/git-annex-installer.exe", "git-annex/windows/current/git-annex-installer.exe") ] diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn index 2aa4ae2ca..57a8b9756 100644 --- a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn +++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__.mdwn @@ -16,3 +16,5 @@ Currently nightly on Android 5.0 (Nexus 5) # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn index 036d19bab..62ecfb638 100644 --- a/doc/install/Android.mdwn +++ b/doc/install/Android.mdwn @@ -10,6 +10,7 @@ of the app. Go to Setup -> Security, and enable "Unknown Sources". Then download the git-annex.apk for your version of Android, and open it to install. +* [Android 5.0 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/5.0/git-annex.apk) * [Android 4.4 and 4.3 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.3/git-annex.apk) * [Android 4.0 to 4.2 git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/4.0/git-annex.apk) |