Merge branch 'tizen_3.0' into tizen 91/136591/1 accepted/tizen/4.0/unified/20170816.010432 accepted/tizen/4.0/unified/20170816.014206 accepted/tizen/4.0/unified/20170828.223725 accepted/tizen/unified/20170703.064240 submit/tizen/20170630.091333 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0/20170828.100002 submit/tizen_4.0_unified/20170814.115522 tizen_4.0.IoT.p1_release tizen_4.0.m2_release
authorLukasz Bardeli <l.bardeli@samsung.com>
Fri, 30 Jun 2017 09:12:40 +0000 (11:12 +0200)
committerLukasz Bardeli <l.bardeli@samsung.com>
Fri, 30 Jun 2017 09:12:40 +0000 (11:12 +0200)
commitdb91783cfb128e9ead80ba0af1436066088bd801
tree112147a99a46acc981275cce68b7d4f3f9b2fcb4
parent48e00cc488ae2b6c42ce1ed686071202942bee3d
parentf956d41504ad196b364cfd53404e3eaef1fbb6a5
Merge branch 'tizen_3.0' into tizen

Change-Id: I3565f4dd966be98f6224138bd68c3a6e2678acb5
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
packaging/cordova-api.spec