Commit graph

5 commits

Author SHA1 Message Date
Ryan Huffman
dc3453a878 Add Window.raiseMainWindow() 2015-03-13 14:10:46 -07:00
Ryan Huffman
33f255fad2 Merge branch 'master' of github.com:highfidelity/hifi into marketplace-window 2015-03-13 11:46:21 -07:00
Ryan Huffman
905de8b03c Adjust marketplace window size 2015-03-13 11:46:15 -07:00
Ryan Huffman
504dceda6b Update edit.js icons 2015-03-13 10:07:12 -07:00
Ryan Huffman
2bedd1cfc7 Move editEntities.js to edit.js 2015-03-12 12:39:06 -07:00
Renamed from examples/editEntities.js (Browse further)