Merge branch '0.16-dev' of https://github.com/gurisxie/incubator-weex into wip-us-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c95944b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c95944b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c95944b2 Branch: refs/heads/0.16-dev Commit: c95944b26d70a73222f769f2a39db546afb2ac5d Parents: 4c8c819 3011541 Author: acton393 <zhangxing610...@gmail.com> Authored: Thu Sep 7 20:29:45 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Sep 7 20:29:45 2017 +0800 ---------------------------------------------------------------------- test/pages/modules/modal-event.vue | 2 +- test/pages/modules/picker-event.vue | 6 +++--- test/screenshot/border-android.png | Bin 158634 -> 162929 bytes test/screenshot/border-ios.png | Bin 126185 -> 128088 bytes test/screenshot/compositing-ios.png | Bin 228306 -> 229534 bytes test/screenshot/image-resize-android.png | Bin 214440 -> 218804 bytes test/screenshot/image-resize-ios.png | Bin 138033 -> 138103 bytes test/scripts/modules/picker-event.test.js | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
