Merge branch 'swap_rename' into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 16 Mar 2012 10:50:52 +0000 (14:50 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 16 Mar 2012 10:50:52 +0000 (14:50 +0400)
1  2 
driver/probes_manager.c

Simple merge