Merge branch 'master' into brightscript_support

Browse Source

Conflicts:
	lib/linguist/samples.json

...

This commit is contained in:

Max Peterson

2013-12-05 13:02:00 -06:00

parent c88585cffb 7e9bc26796

commit 834f37810b

9 changed files with 78 additions and 23 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

samples/JSON/Hello.maxhelp → samples/Max/Hello.maxhelp

0

samples/JSON/Hello.maxpat → samples/Max/Hello.maxpat