Merge branch 'dev' of 106.109.8.71:/srv/git/dbi_new_build into dev
authorAnatoly Sinyavin <a.sinyavin@samsung.com>
Fri, 14 Oct 2011 08:07:26 +0000 (12:07 +0400)
committerAnatoly Sinyavin <a.sinyavin@samsung.com>
Fri, 14 Oct 2011 08:07:26 +0000 (12:07 +0400)
commit38d88ce61e8f4653eceea1a23ade12474fe86726
tree1cfca3f0b4686b10976cf1de5b8bb45c3ee81954
parent9d6cd25a828ad06cba78d4d97d86562299c4aeb8
parent7831d9427a8a7d72f7e0a0cdb5b35171a354b67a
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi_new_build into dev

Conflicts:
src/symbol/CProcLib.cpp