projects / platform / framework / native / image.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3333332 c1709de)
Merge branch 'tizen_2.2' into tizen
authorAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 07:26:44 +0000 (03:26 -0400)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 24 Sep 2013 07:26:44 +0000 (03:26 -0400)
Change-Id: I6d566da781b0eb5102f478e58d6432490668017e

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
packaging/osp-image.spec patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc packaging/osp-image.spec
index d599288,5906525..f907d93
--- 1/packaging/osp-image.spec
--- 2/packaging/osp-image.spec
+++ b/packaging/osp-image.spec
@@@ -1,6 -1,8 +1,6 @@@
 -%define __strip /bin/true
 -
  Name:       osp-image
 -Summary:    The Media Image library of OSP 
 +Summary:    The Media Image library of OSP
- Version:    1.2.1.0
+ Version:    1.2.2.0
  Release:    1
  Group:      TO_BE/FILLED_IN
  License:    TO BE FILLED IN
Domain: Multimedia / Uncategorized;