Merge changes Ie4233a5c,I4d7aba08

* changes:
  Ignore SCons generated files and directories.
  Removed execute permissions from non-executable files.

diff --git a/.gitignore b/.gitignore
index a5463f0..1db09ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,10 @@ dependencies/
 
 #ignore various swap files
 *.swp
+
+# Ignore SCons generated files and directories
+.scon*
+config.log
+os
+out/
+platform

diff --git a/build_common/arduino/SConscript b/build_common/arduino/SConscript
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/makefile b/resource/csdk/makefile
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/stack/include/internal/ocresource.h b/resource/csdk/stack/include/internal/ocresource.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/stack/include/internal/ocresourcehandler.h b/resource/csdk/stack/include/internal/ocresourcehandler.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/stack/include/internal/oicgroup.h b/resource/csdk/stack/include/internal/oicgroup.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/stack/src/occollection.c b/resource/csdk/stack/src/occollection.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/csdk/stack/src/oicgroup.c b/resource/csdk/stack/src/oicgroup.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/src/InProcServerWrapper.cpp b/resource/src/InProcServerWrapper.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resource/src/OCPlatform_impl.cpp b/resource/src/OCPlatform_impl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/service/things-manager/sdk/build/linux/Makefile b/service/things-manager/sdk/build/linux/Makefile
old mode 100755 (executable)
new mode 100644 (file)