Added or'd enums to scripting 33/51333/15
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 6 Nov 2015 16:37:47 +0000 (16:37 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 25 Nov 2015 16:28:13 +0000 (16:28 +0000)
commit6eb6c700336e6b66a7f3c5eb2f17f7c4eef945cc
tree1974304a47df6e8f4dcbc6ccfa4df0be5cbfa600
parent7f9bd77c1b3c3ddb6b496510ea1f35b16b5bc16d
Added or'd enums to scripting

Change-Id: I2ccbf1a549d49ff3acfef9f59c1dd59967bb751a
automated-tests/src/dali-devel/utc-Dali-Scripting.cpp
dali/devel-api/scripting/scripting.cpp
dali/devel-api/scripting/scripting.h