4 Commits

Author	SHA1	Message	Date
Matthew Page	9ae7430379	remove merge comment that was preventing native controls from working	2012-03-20 12:10:00 -07:00
Randy McMillan	9eaacf8a6b	https://github.com/phonegap/phonegap-plugins/pull/388 ... https://github.com/phonegap/phonegap-plugins/pull/388	2012-03-14 14:02:50 -04:00
Randy McMillan	c258409426	Manual merge from pull request https://github.com/phonegap/phonegap-plugins/pull/386 ... Manual merge from pull request https://github.com/phonegap/phonegap-plugins/pull/386	2012-03-13 14:58:06 -04:00
Daniel Jordan	0720d48eea	Added NativeControls with support for Cordova 1.5	2012-03-13 15:50:26 +00:00