diff options
| author | KyungwooNoh <kw1004.noh@samsung.com> | 2013-10-02 11:17:49 +0900 |
|---|---|---|
| committer | KyungwooNoh <kw1004.noh@samsung.com> | 2013-10-02 11:18:08 +0900 |
| commit | 93974ec6cbdf65e867ac41921ff0faae341040c5 (patch) | |
| tree | f21ad78719105f8fd63e580afc5a2a2e750ae182 | |
| parent | c5b3cdf74666a1fb86c40e09daab2ad5141f9c22 (diff) | |
| parent | 51be81f2b27d52075ec07d039e2458562f85371a (diff) | |
| download | application-submit/tizen/20140305.193946.tar.gz application-submit/tizen/20140305.193946.tar.bz2 application-submit/tizen/20140305.193946.zip | |
Merge branch 'tizen_2.2' into tizensubmit/tizen_ivi_stable/20131116.100047submit/tizen/20140305.193946submit/tizen/20131002.044811accepted/tizen_ivi_stable/20131116.102052accepted/tizen/mobile/20140306.024149accepted/tizen/ivi/20140307.191613accepted/tizen/generic/20140306.080409accepted/tizen/20131002.172334accepted/tizen/20131002.171150accepted/tizen/20131002.050404accepted/tizen_genericaccepted/tizen/ivi/stable
Conflicts:
packaging/capi-appfw-application.spec
Change-Id: I408f808cc3951d23f6888f0dc858595f9fa8e568
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>
| -rwxr-xr-x | packaging/capi-appfw-application.spec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/capi-appfw-application.spec b/packaging/capi-appfw-application.spec index 7162d71..ff6ce4c 100755 --- a/packaging/capi-appfw-application.spec +++ b/packaging/capi-appfw-application.spec @@ -1,6 +1,6 @@ Name: capi-appfw-application Summary: An Application library in SLP C API -Version: 0.1.1 +Version: 0.1.0 Release: 55 Group: API License: Apache-2.0 |