Merge "Change domain and sub domain name"

[scm/meta/git.git] / git-trees

diff --git a/git-trees b/git-trees
index 6971fa6..1f9c450 100755 (executable)
--- a/git-trees
+++ b/git-trees
@@ -1452,7 +1452,7 @@ D: Applications / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: apps/native/voice-control-panel
-D: UI Framework / Voice
+D: Applications / Voice Framework
 S: MERGE_IF_NECESSARY
 
 G: apps/native/w3-home
@@ -1796,7 +1796,7 @@ D: Multimedia / Audio FW
 S: MERGE_IF_NECESSARY
 
 G: external/augeas
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: external/avahi
@@ -2248,7 +2248,7 @@ D: System / Kernel
 S: MERGE_IF_NECESSARY
 
 G: external/lsb
-D: System / Uncategorized
+D: System / System Framework
 S: MERGE_IF_NECESSARY
 
 G: external/lsof
@@ -2352,7 +2352,7 @@ D: Service Framework / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: external/psmisc
-D: System / System Tools
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: external/qemu
@@ -4364,7 +4364,7 @@ D: UI Framework / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: framework/uifw/voice/voice-setting
-D: UI Framework / Uncategorized
+D: Applications / Voice Framework
 S: MERGE_IF_NECESSARY
 
 G: framework/uifw/wayland
@@ -5299,7 +5299,7 @@ G: platform/adaptation/samsung_exynos/device-manager-plugin-exynos
 D: System / Uncategorized
 S: MERGE_IF_NECESSARY
 
-G: platform/adaptation/samsung_exynos/device-manager-plugin-exynos3250
+G: profile/wearable/platform/adaptation/samsung_exynos/device-manager-plugin-exynos3250
 D: System / System Framework
 S: MERGE_IF_NECESSARY
 
@@ -5951,11 +5951,11 @@ G: platform/core/appfw/status
 D: App Framework / Notification
 S: MERGE_IF_NECESSARY
 
-G: platform/core/appfw/tizen-platform-config
+G: platform/core/system/tizen-platform-config
 D: System / System Framework
 S: MERGE_IF_NECESSARY
 
-G: platform/core/appfw/tizen-platform-wrapper
+G: platform/core/system/tizen-platform-wrapper
 D: System / System Framework
 S: MERGE_IF_NECESSARY
 
@@ -6464,7 +6464,7 @@ D: Security / Device Policy
 S: MERGE_IF_NECESSARY
 
 G: platform/core/security/dpm-toolkit
-D: Security / Uncategorized
+D: Security / Device Policy
 S: MERGE_IF_NECESSARY
 
 G: platform/core/security/drm-client
@@ -6516,7 +6516,7 @@ D: Security / Access Control
 S: MERGE_IF_NECESSARY
 
 G: platform/core/security/privacy-guard
-D: Security / Uncategorized
+D: Security / Application Privilege
 S: MERGE_IF_NECESSARY
 
 G: platform/core/security/privacy-manager
@@ -7056,7 +7056,7 @@ D: UI Framework / Voice
 S: MERGE_IF_NECESSARY
 
 G: platform/core/uifw/tts-engine-default
-D: UI Framework / Uncategorized
+D: UI Framework / Voice
 S: MERGE_IF_NECESSARY
 
 G: platform/core/uifw/ui-viewmgr
@@ -7103,7 +7103,7 @@ G: platform/core/uifw/xinfo
 D: Graphics System / X Window System
 S: MERGE_IF_NECESSARY
 
-G: platform/framework/base/tizen-locale
+G: platform/core/base/tizen-locale
 D: System / Base
 S: MERGE_IF_NECESSARY
 
@@ -7464,7 +7464,7 @@ D: Security / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/augeas
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/autoconf
@@ -7713,7 +7713,7 @@ D: SCM / Build
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/desktop-file-utils
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/device-mapper
@@ -8109,7 +8109,7 @@ D: Security / Utilities
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/gptfdisk
-D: System / Uncategorized
+D: System / System Framework
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/grep
@@ -8353,7 +8353,7 @@ D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/jsontool
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/kbd
@@ -8917,7 +8917,7 @@ D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/libzypp
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/libzypp-bindings
@@ -8965,7 +8965,7 @@ D: Network & Connectivity / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/lsb
-D: System / Uncategorized
+D: System / System Framework
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/lsof
@@ -8989,7 +8989,7 @@ D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/lzop
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/m4
@@ -9377,7 +9377,7 @@ D: Graphics System / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/psmisc
-D: System / System Tools
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/pth
@@ -9653,7 +9653,7 @@ D: SCM / Build
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/rsync
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/ruby
@@ -9805,7 +9805,7 @@ D: Multimedia / Uncategorized
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/tcl
-D: System / Uncategorized
+D: System / Base
 S: MERGE_IF_NECESSARY
 
 G: platform/upstream/tcpdump
@@ -12231,11 +12231,11 @@ D: Applications / Multimedia
 S: MERGE_IF_NECESSARY
 
 G: profile/mobile/apps/native/voice/voice-control-panel
-D: UI Framework / Voice
+D: Applications / Voice Framework
 S: MERGE_IF_NECESSARY
 
 G: profile/mobile/apps/native/voice/voice-setting
-D: UI Framework / Voice
+D: Applications / Voice Framework
 S: MERGE_IF_NECESSARY
 
 G: profile/mobile/apps/native/volume-app
@@ -12551,7 +12551,7 @@ D: System / System Framework
 S: MERGE_IF_NECESSARY
 
 G: profile/mobile/platform/core/uifw/cbhm
-D: UI Framework / Uncategorized
+D: UI Framework / EFL
 S: MERGE_IF_NECESSARY
 
 G: profile/mobile/platform/core/uifw/downloadable-theme-sample
@@ -15507,7 +15507,7 @@ D: SCM / Build
 S: MERGE_IF_NECESSARY
 
 G: tools/lthor
-D: System / Uncategorized
+D: System / Kernel
 S: MERGE_IF_NECESSARY
 
 G: tools/mic
@@ -15785,7 +15785,7 @@ D: SCM / Build
 S: MERGE_IF_NECESSARY
 
 G: platform/core/security/security-config
-D: Security / Uncategorized
+D: Security / Access Control
 S: MERGE_IF_NECESSARY
 
 G: platform/core/system/system-perf-test
@@ -16012,3 +16012,25 @@ G: platform/core/security/klay
 D: Security / Utilities
 S: MERGE_IF_NECESSARY
 O: Jaemin Ryu <jm77.ryu@samsung.com>
+
+G: platform/upstream/alure
+D: Multimedia / Audio FW
+S: MERGE_IF_NECESSARY
+O: Seungbae Shin <seungbae.shin@samsung.com>
+O: aravind kumar <aravind.gara@samsung.com>
+
+G: platform/core/system/tizen-platform-config-meta
+D: System / System Framework
+S: MERGE_IF_NECESSARY
+O: Kunhoon Baik <knhoon.baik@samsung.com>
+
+G: platform/core/api/alarm
+D: App Framework / Alarm
+S: MERGE_IF_NECESSARY
+O: Jiwoong Im <jiwoong.im@samsung.com>
+
+G: profile/wearable/apps/native/my-account
+D: Applications / Service Framework
+S: MERGE_IF_NECESSARY
+O: Jinkeun Jo <jkjo92@samsung.com>
+