Merge branch 'devel/tizen_3.0' into tizen 09/57109/1 accepted/tizen/mobile/20160118.044020 accepted/tizen/tv/20160118.044049 accepted/tizen/wearable/20160118.044109 submit/tizen/20160118.014643
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 15 Jan 2016 06:37:33 +0000 (15:37 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 15 Jan 2016 06:37:33 +0000 (15:37 +0900)
commit5e334fac6d169032c5b1dfea9a7d0e60ec842e3c
tree3f4084ac401b4a3678f69111890a9737843c8427
parenta9ae98acaf2bb697973bf380b7fee3226ee0ef0e
parent3275fdf9a4a441128b1cbf78855137937c6901b6
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.7.0
  Rule validation changed - _event_create(), condition_create() will return NOT_SUPPORTED - Only needed template information will be requested - Removed integer type of attribute/option definition
  Arranged operator related. - ==, != won't be converted to eq, neq - operator validity check function added
  Modified template format in rule_info to match server-side template style
  Modified api reference
  Modified subject of time related items.
  Removed double quotations around string comparison data. Modified to not convert integer comparison data to string.

Change-Id: I1ec1adc9c615dc9c1bc11cc3a116d308e8706005
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>