Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source

Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html

...

This commit is contained in:

Egil Moeller 2012-05-29 21:26:12 +02:00

parent fc946ffc33 dfd81b79d4

commit 15a7d24450

32 changed files with 375 additions and 1962 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

859

src/static/css/pad.css

View file

File diff suppressed because it is too large Load diff