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)
commit79c3b3c07cafc8dc4608cfd178773e17a87e5ae0
tree338068110d5d3ecc8bf507bd51a9ff9ab934248f
parentf411030005ce7dee54e12e7da3af739581794f84
parent81b923d485daa187643fa091f3feedcadd66f2bc
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/events.h
driver/probes_manager.c