You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/16 21:01:15 UTC

[3/3] android commit: Merge branch 'master' into 4.0.x (unaligned apk fix)

Merge branch 'master' into 4.0.x (unaligned apk fix)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6fb164d2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6fb164d2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6fb164d2

Branch: refs/heads/4.0.x
Commit: 6fb164d200d94f7c8ef9df15e86d4a4f779df31c
Parents: 6eb4409 a5d300c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 15:00:54 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 15:00:54 2014 -0400

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------