Merge branch 'dev_trailing_spaces_removal' of git://github.com/0xc0170/mbed into 0xc0170-dev_trailing_spaces_removal

Conflicts:
	workspace_tools/toolchains/__init__.py
	workspace_tools/toolchains/arm.py
pull/344/head
Bogdan Marinescu 2014-06-03 10:39:31 +01:00
commit bb120221fb
218 changed files with 2093 additions and 2090 deletions

3
.gitignore vendored
View File

@ -60,3 +60,6 @@ debug.log
# Ignore OS X Desktop Services Store files
.DS_Store
# Orig diff files
*.orig