diff options
author | Erich Keane <erich.keane@intel.com> | 2015-04-09 17:50:26 -0700 |
---|---|---|
committer | Erich Keane <erich.keane@intel.com> | 2015-04-10 12:06:24 -0700 |
commit | 9015fb1a75f3b43b57153b840f73a2ebc4bb8a63 (patch) | |
tree | 014c7d90ff551ecb211cc5d47a12b657fddfb6dd /.gitignore | |
parent | af9f5813db40c69283b1d25e3aeade2924e2022e (diff) | |
parent | 8c3d005c76871cdcb238343e2563bdbfd6a7ee59 (diff) | |
download | iotivity-9015fb1a75f3b43b57153b840f73a2ebc4bb8a63.tar.gz iotivity-9015fb1a75f3b43b57153b840f73a2ebc4bb8a63.tar.bz2 iotivity-9015fb1a75f3b43b57153b840f73a2ebc4bb8a63.zip |
Merge branch 'connectivity-abstraction' to master
Change-Id: I54ea8ab0ea7c4929576ac9b613ce19c79a5c92b8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8aee5b23d..1c4ddabb5 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,11 @@ extlibs/hippomocks-master/ extlibs/master.zip extlibs/cereal/cereal extlibs/expat/expat* +extlibs/cereal +*.tgz +*.zip +extlibs/arduino/arduino-1.5.8 +build_common/arduino/extlibs/arduino/arduino-1.5.8 # Ignore editor (e.g. Emacs) backup and autosave files *~ |