Merge "Add myself as Qt maintainer and Codec Integrator"

diff --git a/domains b/domains
index e9602ae..0f0803b 100644 (file)
--- a/domains
+++ b/domains
@@ -680,6 +680,7 @@ D: Multimedia / Audio FW
 N: Multimedia
 M: vivian.zhang@intel.com
 M: bw.jang@samsung.com
+M: ismo.puustinen@intel.com
 I: jaska.uimonen@intel.com
 I: huaqiangx.geng@intel.com
 
@@ -948,6 +949,7 @@ R: Qiang Zhang <qiang.z.zhang@intel.com>
 R: Tracy Graydon <tracy.graydon@intel.com>
 
 D: SCM / BB
+N: SCM
 M: Kévin Thierry <kevin.thierry@open.eurogiciel.org>
 M: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org>
 M: Stéphane Desneux <stephane.desneux@open.eurogiciel.org>
@@ -1114,9 +1116,9 @@ D: Security
 A: Hyun-Jin Choi <hj89.choi@samsung.com>
 A: Jinmin Chung <jinmin@tizen.org>
 A: Ryan Ware <ryan.r.ware@intel.com>
+A: Casey Schaufler <casey.schaufler@intel.com>
 M: Bartlomiej Grzelewski <b.grzelewski@samsung.com>
 M: Bumjin Im <bj.im@samsung.com>
-M: Casey Schaufler <casey.schaufler@intel.com>
 M: Catalin Ionita <catalin.ionita@intel.com>
 M: Dean Pierce
 M: Elena Reshetova <elena.reshetova@intel.com>

diff --git a/git-trees b/git-trees
index a0a7454..e033656 100644 (file)
--- a/git-trees
+++ b/git-trees
@@ -11741,11 +11741,11 @@ D: Automotive / GENIVI
 B: tizen
 
 T: profile/ivi/gsignond
-D: Automotive / <gSSO. Move to Security domain>
+D: Automotive
 B: tizen
 
 T: profile/ivi/gsignond-plugin-oauth
-D: Automotive / <gSSO. Move to Security domain>
+D: Automotive
 B: tizen
 
 T: profile/ivi/ico-uxf-device-input-controller
@@ -11807,11 +11807,11 @@ D: Automotive / DLNA
 B: tizen
 
 T: profile/ivi/libgsignon-glib
-D: Automotive / <gSSO. Move to Security domain>
+D: Automotive
 B: tizen
 
 T: profile/ivi/libwebsockets
-D: Automotive / <Move to Connectivity domain>
+D: Automotive
 B: tizen
 
 T: profile/ivi/meta-ivi
@@ -11844,7 +11844,7 @@ D: Automotive / Speech
 B: tizen
 
 T: profile/ivi/psplash
-D: Automotive / <remove>
+D: Automotive
 B: tizen
 
 T: profile/ivi/pulseaudio-module-murphy-ivi
@@ -11893,7 +11893,7 @@ D: Automotive / Configuration
 B: tizen
 
 T: profile/ivi/signonui-efl
-D: Automotive / <gSSO. Move to Security domain>
+D: Automotive
 B: tizen
 
 T: profile/ivi/smartdevicelink
@@ -11911,7 +11911,7 @@ M: Rusty Lynch <rusty.lynch@intel.com>
 B: tizen
 
 T: profile/ivi/weekeyboard
-D: Automotive / <remove. Duplicate with platform/upstream/weekeyboard>
+D: Automotive
 M: Philippe Coval <philippe.coval@open.eurogiciel.org>
 B: tizen