Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire

This commit is contained in:
Seth Alves 2015-06-27 10:12:59 -07:00
commit aa3c7eac9b

View file

@ -127,7 +127,7 @@ enum EntityPropertyList {
PROP_ACTION_DATA,
////////////////////////////////////////////////////////////////////////////////////////////////////
// ATTENTION: add new properties ABOVE this line
// ATTENTION: add new properties to end of list just ABOVE this line
PROP_AFTER_LAST_ITEM,
////////////////////////////////////////////////////////////////////////////////////////////////////