Merge branch 'master' of github.com:ThrowTheSwitch/CMock

Conflicts:
	.gitmodules
	targets/gcc.yml
	vendor/c_exception
This commit is contained in:
John Van Enk
2012-06-20 20:35:40 -04:00
8 changed files with 427 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
[submodule "vendor/unity"]
path = vendor/unity
url = git@github.com:ThrowTheSwitch/Unity.git
url = git://github.com/ThrowTheSwitch/Unity.git
[submodule "vendor/c_exception"]
path = vendor/c_exception
url = git://github.com/ThrowTheSwitch/CException.git