sync with master

diff --git a/project/manifest.xml b/project/manifest.xml
index d14866c..f6d94cb 100644 (file)
--- a/project/manifest.xml
+++ b/project/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
     <Id>$(manifestAppId)</Id>
-    <Version>1.0.0</Version>
+    <Version>2.0.0</Version>
     <Type>C++App</Type>
     <Author/>
     <Descriptions>

diff --git a/project/res/screen-density-high/Tizen.png b/project/res/screen-density-high/Tizen.png
new file mode 100644 (file)
index 0000000..beaea09
Binary files /dev/null and b/project/res/screen-density-high/Tizen.png differ

diff --git a/sample.xml b/sample.xml
index 03aa4d9..b0fe7b7 100644 (file)
--- a/sample.xml
+++ b/sample.xml
@@ -29,7 +29,7 @@
                                <simple name="framework" value="osp"/>
                        </element>
                        <element>
-                               <simple name="framework" value="osp-compact"/>
+                               <simple name="framework" value="osp-compat"/>
                        </element>
                </complex-array>
        </process>