Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo

This commit is contained in:
Stephen Birarda 2015-06-29 10:57:16 -07:00
commit 133247ec6d
2 changed files with 1 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View file

@ -50,7 +50,7 @@ namespace Cursor {
Manager::Manager() {
ICONS[Icon::DEFAULT] = PathUtils::resourcesPath() + "images/arrow.png";
ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/reticleLink.png";
ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/link.png";
}
Manager& Manager::instance() {