Merge branch 'tizen_2.2' into tizen 40/10440/1 accepted/tizen/ivi/stable accepted/tizen_generic accepted/tizen/20131002.050404 accepted/tizen/20131002.171150 accepted/tizen/20131002.172334 accepted/tizen/generic/20140306.080409 accepted/tizen/ivi/20140307.191613 accepted/tizen/mobile/20140306.024149 accepted/tizen_ivi_stable/20131116.102052 submit/tizen/20131002.044811 submit/tizen/20140305.193946 submit/tizen_ivi_stable/20131116.100047
authorKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 02:17:49 +0000 (11:17 +0900)
committerKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 02:18:08 +0000 (11:18 +0900)
commit93974ec6cbdf65e867ac41921ff0faae341040c5
treef21ad78719105f8fd63e580afc5a2a2e750ae182
parentc5b3cdf74666a1fb86c40e09daab2ad5141f9c22
parent51be81f2b27d52075ec07d039e2458562f85371a
Merge branch 'tizen_2.2' into tizen

Conflicts:
packaging/capi-appfw-application.spec

Change-Id: I408f808cc3951d23f6888f0dc858595f9fa8e568
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>
packaging/capi-appfw-application.spec