Merge remote-tracking branch 'origin/tizen' into new_text 32/35432/1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Feb 2015 17:11:17 +0000 (17:11 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Feb 2015 17:17:02 +0000 (17:17 +0000)
Change-Id: I069b1991f503d790346f087a6512bfff123d54c9

1  2 
examples/cluster/cluster-example.cpp

Simple merge