[Merge] lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash into lp:properties-cpp

[Marcus Tomlinson]

Marcus Tomlinson has proposed merging lp:~marcustomlinson/properties-cpp/fix_qt_keyword_clash into lp:properties-cpp.

Commit message:
Renamed "slots" to "slot_list" in signal.h as to avoid clashing with the "slots" Qt keyword.

Requested reviews:
  Thomas Voß (thomas-voss)

For more details, see:
https://code.launchpad.net/~marcustomlinson/properties-cpp/fix_qt_keyword_clash/+merge/223056
-- 
https://code.launchpad.net/~marcustomlinson/properties-cpp/fix_qt_keyword_clash/+merge/223056
Your team Ubuntu Phablet Team is subscribed to branch lp:properties-cpp.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3815 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140613/83163409/attachment.diff>