Merge changes Ie130c1b6,I9ecf9025 into tizen
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 19 Jun 2015 07:03:18 +0000 (00:03 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 19 Jun 2015 07:03:18 +0000 (00:03 -0700)
commitb5fefe4d84d6b372655afed83413cb75b5e00aa2
tree49f0ba3fc54661688630044833a0c54484302ad9
parentae2c0d25586fe515e276b9a68e2f78627b3b4cad
parentfc62b5c4fc0fe2f244cd9f63e4e2ed3881ab11cf
Merge changes Ie130c1b6,I9ecf9025 into tizen

* changes:
  fix function declaration
  Remove unused resource file
src/option.cpp