projects / platform / core / system / swap-manager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3154ea5 4cbda5b)
Merge branch 'tizen_2.4_dev' into tizen 01/59201/2 accepted/tizen/common/20160316.155427 accepted/tizen/ivi/20160325.031936 accepted/tizen/mobile/20160325.031844 accepted/tizen/tv/20160325.031856 accepted/tizen/wearable/20160325.031917 submit/tizen/20160314.042250 submit/tizen/20160323.060544
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 10 Feb 2016 12:44:22 +0000 (15:44 +0300)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Fri, 12 Feb 2016 13:31:38 +0000 (05:31 -0800)
commitd389443b04c7212e3884c25aa1fa2fae2a24f005
treee03f38f2dca4eef22ac41b522eccef2d4587afc4tree | snapshot
parent3154ea515f1d15630c8b68b4336f27c7d02087a0commit | diff
parent4cbda5b00e1e4bd44529d6c6a0b6163390bc03fdcommit | diff
Merge branch 'tizen_2.4_dev' into tizen

Conflicts:
scripts/gen_preload_header.sh
scripts/swap_start.sh

Change-Id: I5536610f3156ba18547f53ffe5a78572d546646d
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
daemon/Makefile diff1 | diff2 | blob | history
daemon/daemon.c diff1 | diff2 | blob | history
packaging/swap-manager.spec diff1 | diff2 | blob | history
scripts/gen_preload_header.sh diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;