projects / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 289bf6f 008d1e6)
Merge branch 'for_tizen_2.4' into tizen_2.4_dev 20/52020/1
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 18 Nov 2015 09:03:19 +0000 (12:03 +0300)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 18 Nov 2015 09:03:19 +0000 (12:03 +0300)
Conflicts:
preload/preload_control.c

Change-Id: Ic0455598c0e156f8dd8fbb937c0320a4e472ddb4
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
1  2 
packaging/swap-modules.spec patch | diff1 | diff2 | blob | history
us_manager/helper.c patch | diff1 | diff2 | blob | history

diff --cc packaging/swap-modules.spec
Simple merge
diff --cc us_manager/helper.c
Simple merge
Domain: System / System Tools;