| commit | 411ec2481ddc0e224bf3db0bfa987b9ceea9d7a9 | [log] [tgz] |
|---|---|---|
| author | Christofer Dutz <christofer.dutz@c-ware.de> | Sun Mar 11 12:20:34 2018 +0100 |
| committer | Christofer Dutz <christofer.dutz@c-ware.de> | Sun Mar 11 12:20:34 2018 +0100 |
| tree | 8759bfe13692661a18c4d36f8e1360f0642a21d8 | |
| parent | 1c6df3cf96f9ea160105c697567f618e0d6ab963 [diff] | |
| parent | 1ad6614c5fd266e69d4d38f48e6083f0dd08bffb [diff] |
Merge branch 'EDGENT-448' of https://github.com/yanghua/incubator-edgent into develop
diff --git a/.gitignore b/.gitignore index ee57946..61dd0ec 100644 --- a/.gitignore +++ b/.gitignore
@@ -37,4 +37,7 @@ .settings/ # Emacs -*~ \ No newline at end of file +*~ + +# Mac os x +*.DS_Store \ No newline at end of file