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)
commitc9cb504dc30b4ddac420f9aefa31e5ba40f60740
treef155ebf72c90aeacdffa82c9299319d349855a85
parent5b7274876c5e0d0c353dbdf7e2c56899e0183a55
parent6c11f68ce3c4e36246c0ac268fc6e59bfe7283a6
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I069b1991f503d790346f087a6512bfff123d54c9
examples/cluster/cluster-example.cpp