12 commits

Author	SHA1	Message	Date
Atlante45	c421adaf58	Fix unresolve merge conflict	2015-03-16 16:27:33 +01:00
Atlante45	ad16f49d01	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-16 14:28:24 +01:00
Clément Brisset	dfd39ca1e1	Merge pull request #4448 from huffman/loading-image ... Add hourglass image to loading svo overlay	2015-03-16 06:25:41 -07:00
Stephen Birarda	641581a825	Merge pull request #4446 from huffman/marketplace-window ... Marketplace window	2015-03-13 17:51:44 -07:00
Ryan Huffman	76f474bff1	Add hourglass image to loading svo overlay	2015-03-13 14:48:33 -07:00
Ryan Huffman	d512a67c8a	Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays	2015-03-13 14:13:56 -07:00
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
Atlante45	36814e837b	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-13 19:05:17 +01: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)