X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=git-trees;h=750645283c3a3d0e3f093af0139da44e50cc7da1;hb=56f04da02b99b092b248021006882eb533ee8596;hp=dee9bde7fc45afc8a9045c987a712a1792f6d3d8;hpb=60cbd5eca1d5b2c85e0a4608ce2d771e05ffbd0a;p=scm%2Fmeta%2Fgit.git

diff --git a/git-trees b/git-trees
index dee9bde..7506452 100755
--- a/git-trees
+++ b/git-trees
@@ -11537,6 +11537,28 @@ T: DEV
 O: Jiyong Min <jiyong.min@samsung.com>
 L: 
 
+G: platform/core/multimedia/dfs-adaptation
+D: Multimedia / Media Vision
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Hyunsoo Park <hance.park@samsung.com>
+O: Inki Dae <inki.dae@samsung.com>
+O: kwang son <k.son@samsung.com>
+O: sangho park <sangho.g.park@samsung.com>
+O: Tae-Young Chung <ty83.chung@samsung.com>
+L: Apache-2.0
+
+G: platform/core/multimedia/dfs-opencv
+D: Multimedia / Media Vision
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Hyunsoo Park <hance.park@samsung.com>
+O: Inki Dae <inki.dae@samsung.com>
+O: kwang son <k.son@samsung.com>
+O: sangho park <sangho.g.park@samsung.com>
+O: Tae-Young Chung <ty83.chung@samsung.com>
+L: Apache-2.0
+
 G: platform/core/multimedia/esplusplayer
 D: Multimedia / Media Playback
 S: MERGE_IF_NECESSARY
@@ -11940,6 +11962,17 @@ O: sangho park <sangho.g.park@samsung.com>
 O: Tae-Young Chung <ty83.chung@samsung.com>
 L: Apache-2.0
 
+G: platform/core/multimedia/vision-source-v4l2
+D: Multimedia / Media Vision
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Hyunsoo Park <hance.park@samsung.com>
+O: Inki Dae <inki.dae@samsung.com>
+O: kwang son <k.son@samsung.com>
+O: sangho park <sangho.g.park@samsung.com>
+O: Tae-Young Chung <ty83.chung@samsung.com>
+L: Apache-2.0
+
 G: platform/core/pim/calendar-service
 D: Service Framework / PIMS
 S: MERGE_IF_NECESSARY
@@ -13695,14 +13728,6 @@ T: DEV
 O: Jihoon Kim <jihoon48.kim@samsung.com>
 L: 
 
-G: platform/core/uifw/inputmethod-setting-nui
-D: UI Framework / Text Input
-S: MERGE_IF_NECESSARY
-T: DEV
-O: InHong Han <inhong1.han@samsung.com>
-O: Jihoon Kim <jihoon48.kim@samsung.com>
-L: Apache-2.0
-
 G: platform/core/uifw/ise-default
 D: UI Framework / Text Input
 S: MERGE_IF_NECESSARY
@@ -13818,6 +13843,14 @@ O: SooChan Lim <sc1.lim@samsung.com>
 O: Sung-Jin Park <sj76.park@samsung.com>
 L: MIT
 
+G: platform/core/uifw/libds-tizen
+D: Graphics System / Display Server
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Gwanglim Lee <gl77.lee@samsung.com>
+O: SooChan Lim <sc1.lim@samsung.com>
+L: MIT
+
 G: platform/core/uifw/libeom
 D: Graphics System / Display Management
 S: MERGE_IF_NECESSARY
@@ -14975,6 +15008,16 @@ O: Hyotaek Shim <hyotaek.shim@samsung.com>
 O: youngjae cho <y0.cho@samsung.com>
 L: Apache-2.0
 
+G: platform/hal/backend/vim3/power-vim3
+D: System / Kernel
+S: REBASE_IF_NECESSARY
+T: DEV
+O: Chanwoo Choi <cw00.choi@samsung.com>
+O: Dongwoo Lee <dwoo08.lee@samsung.com>
+O: sungguk na <sungguk.na@samsung.com>
+O: Sung-hun Kim <sfoon.kim@samsung.com>
+L: Apache-2.0
+
 G: platform/hal/backend/vim3/sensor-vim3
 D: System / System Framework
 S: MERGE_IF_NECESSARY
@@ -23122,6 +23165,16 @@ O: Krzysztof Wieclaw <k.wieclaw@samsung.com>
 O: Radoslaw Czerski <r.czerski@samsung.com>
 L: Apache-2.0
 
+G: profile/iot/apps/dotnet/privacy-setting
+D: Applications / Security
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Jin-gyu Kim <jin-gyu.kim@samsung.com>
+O: Kim Kidong <kd0228.kim@samsung.com>
+O: Kyungim Jung <kyung@samsung.com>
+O: Yunjin Lee <yunjin-.lee@samsung.com>
+L: Apache-2.0
+
 G: profile/iot/apps/dotnet/screen-mirroring-sink
 D: Applications / Multimedia
 S: MERGE_IF_NECESSARY
@@ -23131,6 +23184,42 @@ O: Amritanshu Pandia <amritanshu.pandia@gmail.com>
 O: Jin Yoon <jinny.yoon@samsung.com>
 L: Apache-2.0
 
+G: profile/iot/apps/dotnet/setting-inputmethod
+D: UI Framework / Text Input
+S: MERGE_IF_NECESSARY
+T: DEV
+O: InHong Han <inhong1.han@samsung.com>
+O: Jihoon Kim <jihoon48.kim@samsung.com>
+L: Apache-2.0
+
+G: profile/iot/apps/dotnet/setting-privacy
+D: Applications / Security
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Jin-gyu Kim <jin-gyu.kim@samsung.com>
+O: Kim Kidong <kd0228.kim@samsung.com>
+O: Kyungim Jung <kyung@samsung.com>
+O: Yunjin Lee <yunjin-.lee@samsung.com>
+L: Apache-2.0
+
+G: profile/iot/apps/dotnet/settings
+D: Applications / Settings
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Jin Yoon <jinny.yoon@samsung.com>
+O: Kiseok Chang <kiso.chang@samsung.com>
+L: Apache-2.0
+
+G: profile/iot/apps/dotnet/tray
+D: Applications / IoT
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Dipika Tanwar <dipika.t@samsung.com>
+O: Jin Yoon <jinny.yoon@samsung.com>
+O: Shivam Varshney <shivam.v2@samsung.com>
+O: Tarun Mahay <tarun.mahay@samsung.com>
+L: Apache-2.0
+
 G: profile/iot/apps/native/askuser-popup
 D: Applications / Security
 S: MERGE_IF_NECESSARY