You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:57:56 UTC

[8/8] git commit: Merge tag 'r0.3.0'

Merge tag 'r0.3.0'

Conflicts:
	src/tizen/SplashScreenProxy.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/0838b1d3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/0838b1d3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/0838b1d3

Branch: refs/heads/master
Commit: 0838b1d3a72770068e8a36a422d90807a5c782dd
Parents: 3d553eb 8052d38
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Apr 23 14:48:08 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 23 14:48:48 2014 -0400

----------------------------------------------------------------------
 NOTICE                            |  5 ++++
 RELEASENOTES.md                   |  8 +++++++
 plugin.xml                        | 28 ++++++++++++++++++++--
 src/ios/CDVSplashScreen.m         |  2 +-
 src/tizen/SplashScreenProxy.js    | 43 ++++++++++++++++++++++++++++++++++
 www/windows8/SplashScreenProxy.js |  2 +-
 6 files changed, 84 insertions(+), 4 deletions(-)
----------------------------------------------------------------------