Merge branch 'ui-refactor' into menu2

This commit is contained in:
Brad Davis 2015-04-25 17:00:07 -07:00
commit b77b3e4f3d

View file

@ -45,7 +45,3 @@ protected:
};
#endif // hifi_HifiMenu_h