Merge branch 'adfernandes-master' into develop

This commit is contained in:
Rohit Grover 2015-07-13 07:40:09 +01:00
commit 7aaf768fde

View file

@ -140,8 +140,8 @@ public:
}
public:
UUID::ShortUUIDBytes_t getShortUUID(void) const {
return uuid.getShortUUID();
const UUID& getUUID(void) const {
return uuid;
}
const Properties_t& getProperties(void) const {