0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-12-23 05:33:49 +01:00
doodle3d-client/www
Adriaan Wormgoor ff98a24526 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By Wouter R
# Via Wouter R
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Re-added two css files which were accidentally untracked.
  Untrack and ignore derived files in www/js and www/css directories.
  Change references to minified stylesheets.
  Add openwrt package Makefile. Add short description of steps to build css and js files.
  Fix permissions.

Conflicts:
	www/css/styles.css
	www/css/styles.min.css
	www/index.html
	www/js/doodle3d-client.js
	www/js/doodle3d-client.min.js
2013-10-23 06:48:29 +02:00
..
css added a simple help layer to the app (jquery joyride) 2013-10-23 06:46:07 +02:00
img Fix permissions. 2013-10-22 17:39:44 +02:00
js Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 2013-10-23 06:48:29 +02: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 a simple help layer to the app (jquery joyride) 2013-10-23 06:46:07 +02:00
index.html Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 2013-10-23 06:48:29 +02:00
settings.html Change references to minified stylesheets. 2013-10-22 19:43:37 +02:00