projects / platform / kernel / swap-modules.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f411030 81b923d)
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 12 Feb 2013 14:06:01 +0000 (18:06 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 12 Feb 2013 14:06:01 +0000 (18:06 +0400)
Conflicts:
src/modules/driver/events.h

1  2 
driver/probes_manager.c patch | diff1 | diff2 | blob | history

diff --cc driver/probes_manager.c
Simple merge
Domain: SDK / Dynamic Analysis;