Wouter R d634f2e9c3 Merge branch 'text-experiment' into develop ...

Conflicts:
	js/Help.js
	js/buttonbehaviors.js
	js/main.js
	js_src/Keyboard.js
	js_src/Shape.js
	js_src/verticalShapes.js
	www/index.html

2014-01-17 13:21:02 +01:00

..

css

Improved retain configuration over update ui

2014-01-02 16:46:36 +01:00

img

Restyled settings popup

2014-01-16 22:51:19 +01:00

js

Removed grunt generated js libraries

2013-11-22 17:52:24 +01:00

library/test

overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files

2013-10-21 11:40:38 +02:00

favicon_alt.ico

overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files

2013-10-21 11:40:38 +02:00

favicon.ico

Fix permissions.

2013-10-22 17:39:44 +02:00

favicon.png

overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files

2013-10-21 11:40:38 +02:00

helpcontent.html

Added edit button group to tour

2014-01-17 12:10:34 +01:00

index.html

Merge branch 'text-experiment' into develop

2014-01-17 13:21:02 +01:00

redirect.html

404 page

2013-10-29 12:42:03 +01:00

settings.html

Add settings for bottom layer speed and bottom layer flow rate.

2014-01-10 17:47:05 +01:00