Merge remote-tracking branch 'origin/baseflight-configurator-development' into GUI-rework

Browse source

Conflicts:
	README.md
	js/libraries/d3.min.js
	js/msp.js
	main.html

...

This commit is contained in:

skaman82 2015-10-23 14:41:08 +02:00

parent f4539ed413 e2df936491

commit 3a9c7f3794

8 changed files with 89 additions and 8 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

10

js/libraries/d3.min.js vendored

View file

File diff suppressed because one or more lines are too long