diff options
author | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-01-17 15:05:27 -0500 |
---|---|---|
committer | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-01-17 15:05:27 -0500 |
commit | d5d62371b4b6b2c2c7211aef55a3a967540948fe (patch) | |
tree | ee77def47b9656b56c133393aa4116a26f3e89e5 | |
parent | ad6058e1fcaa780fe2f6537412fd6663df9f5cc6 (diff) | |
parent | e7240a7c3837cec877d0d487a3f9ae66bc0395ae (diff) |
Merge branch 'master' into diagnostic
-rw-r--r-- | .gitmodules | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index aaa1a95c..a03da7b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "libs/nanopb"] path = libs/nanopb url = https://code.google.com/p/nanopb/ + ignore = dirty |