Merge branch 'tizen_3.0' into tizen

Change-Id: I9e800b96f76b19213291a1737833587c3481f2ad

diff --git a/inc/MicEffector.h b/inc/MicEffector.h
index aa3b821..7264fd7 100755 (executable)
--- a/inc/MicEffector.h
+++ b/inc/MicEffector.h
@@ -147,7 +147,6 @@ class MicEffector
                std::vector<int> current;
 
        public :
-               int startcount;
                int drawcount;
                bool forcestop;
                bool started;

diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml
index 1415011..b56d48f 100755 (executable)
--- a/org.tizen.inputdelegator.xml
+++ b/org.tizen.inputdelegator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.inputdelegator" version="0.1.170216">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.inputdelegator" version="0.1.170316">
        <profile name="wearable" />
 
        <ui-application appid="org.tizen.inputdelegator" exec="/usr/apps/org.tizen.inputdelegator/bin/inputdelegator" launch_mode="caller" type="capp" multiple="false" taskmanage="false" hw-acceleration="use-GL" nodisplay="true" process-pool="true">

diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec
index ddef11b..6f10afb 100755 (executable)
--- a/packaging/org.tizen.inputdelegator.spec
+++ b/packaging/org.tizen.inputdelegator.spec
@@ -9,7 +9,7 @@ ExclusiveArch:  none
 
 Name: org.tizen.inputdelegator
 Summary: Input Delegator Application
-Version: 0.1.170216
+Version: 0.1.170316
 Release: 1
 Group: Applications
 License: Apache-2.0
@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(edbus)
 
 BuildRequires: cmake
 BuildRequires: edje-bin
-BuildRequires: gettext
+BuildRequires: gettext-tools
 
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(capi-appfw-application)