projects / kernel / swap-modules.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit982a8d8e168748b7fa51bfdc5ece6540aa36f6d5
tree73d4ffd97608dd25f70552067740e371bb1dc74ftree | snapshot
parent289bf6f20421ddfae60021ce69a94d13cf501ed1commit | diff
parent008d1e6444ca222ea8378640a68010f74730a616commit | diff
Merge branch 'for_tizen_2.4' into tizen_2.4_dev

Conflicts:
preload/preload_control.c

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