Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver

Browse Source

# 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

...

This commit is contained in:

Adriaan Wormgoor

2013-10-23 06:48:29 +02:00

parent d3029096a7 02d026e52a

commit ff98a24526

29 changed files with 91 additions and 4806 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

js_src/libs/jquery-cookie.js vendored Executable file → Normal file