Merge changes Ie4233a5c,I4d7aba08
authorPatrick Lankswert <patrick.lankswert@intel.com>
Fri, 19 Dec 2014 21:14:41 +0000 (13:14 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Fri, 19 Dec 2014 21:14:41 +0000 (13:14 -0800)
commit3375ed12998d1261d46d4ececbdb500194ce2573
tree34aa32f9408a340e5e6e0328783fd16bf33cf6ce
parentd2148e9331f4b73ffecec6fad478b7ae998bd54b
parent1f4d948d2c6cbe25be46550fc0ce63cf7e424400
Merge changes Ie4233a5c,I4d7aba08

* changes:
  Ignore SCons generated files and directories.
  Removed execute permissions from non-executable files.
resource/csdk/stack/include/internal/ocresource.h
resource/csdk/stack/include/internal/ocresourcehandler.h
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/oicgroup.c
resource/include/OCApi.h
resource/src/InProcServerWrapper.cpp
resource/src/OCPlatform_impl.cpp