From: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Date: Thu, 30 Nov 2017 09:14:11 +0000 (+0300)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180109.094119~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db0f6eb9364df2fb960372c199d056151bc79edf;p=platform%2Fcore%2Fsystem%2Fswap-manager.git

Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: I760b35399e2790ffd0d09fae7df56fe1201baff2
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
---

db0f6eb9364df2fb960372c199d056151bc79edf
diff --cc daemon/Makefile
index 5547dce,d1f6d1b..2337c11
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@@ -105,7 -106,9 +105,8 @@@ SRC_C := 
  	smack.c \
  	malloc_debug.c \
  	target.c \
- 	thread.c
+ 	thread.c \
 -	thread_cond.c \
 -	ui_viewer.c
++	thread_cond.c
  
  SRC_CPP := \
  	cpp/features/feature.cpp \