projects
/
platform
/
core
/
uifw
/
multi-assistant-service.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe6aa89
15f3af7
)
Merge branch 'tizen_6.0' into tizen
06/262406/1
author
Ji-hoon Lee
<dalton.lee@samsung.com>
Tue, 10 Aug 2021 05:25:55 +0000
(14:25 +0900)
committer
Ji-hoon Lee
<dalton.lee@samsung.com>
Tue, 10 Aug 2021 05:25:55 +0000
(14:25 +0900)
Change-Id: I51d38a7e2b5dd59d359cb7fd1dc99fbbc6d5aa0d
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
plugins/wakeup-manager/src/wakeup_engine_manager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/service_ipc_dbus.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/service_plugin.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
Simple merge
diff --cc
plugins/wakeup-manager/src/wakeup_engine_manager.cpp
Simple merge
diff --cc
plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
Simple merge
diff --cc
src/service_ipc_dbus.cpp
Simple merge
diff --cc
src/service_plugin.cpp
Simple merge