David Rowe f7f5443a44 Merge branch 'master' into 20872 ... Conflicts: examples/html/entityProperties.html		2016-04-12 15:40:35 +12:00
..
css
magBalls	Working on magballs polish	2015-09-03 20:09:54 -07:00
colpick.js	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
edit-style.css	Revisit margins and spacing	2016-04-12 15:07:30 +12:00
entityList.html	Revisit margins and spacing	2016-04-12 15:07:30 +12:00
entityProperties.html	Merge branch 'master' into 20872	2016-04-12 15:40:35 +12:00
eventBridgeLoader.js	Working on the App JS <-> HTML JS communication	2016-03-28 10:09:22 -07:00
gridControls.html	Replace grid color presets with color picker plus RGB fields	2016-04-08 12:46:06 +12:00
jquery-2.1.4.min.js
jsstreamplayer.html	Added jsstreamplayer.	2015-07-20 14:19:16 -04:00
list.min.js
plankySettings.html	small planky improvements	2015-07-14 20:27:51 +02:00
qmlWebTest.html	Working on the App JS <-> HTML JS communication	2016-03-28 10:09:22 -07:00
style.css	Added Refresh Buttons to entityProperties	2016-03-24 01:14:48 +02:00
walkSettings.html
walkStyle.css	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00