projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d2148e9
1f4d948
)
Merge changes Ie4233a5c,I4d7aba08
author
Patrick Lankswert
<patrick.lankswert@intel.com>
Fri, 19 Dec 2014 21:14:41 +0000
(13:14 -0800)
committer
Gerrit Code Review
<gerrit@oicreview.vlan14.01.org>
Fri, 19 Dec 2014 21:14:41 +0000
(13:14 -0800)
* changes:
Ignore SCons generated files and directories.
Removed execute permissions from non-executable files.
1
2
resource/csdk/stack/include/internal/ocresource.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/include/internal/ocresourcehandler.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/occollection.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/csdk/stack/src/oicgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
resource/include/OCApi.h
patch
|
diff1
|
diff2
|
blob
|
history
resource/src/InProcServerWrapper.cpp
patch
|
diff1
|
diff2
|
blob
|
history
resource/src/OCPlatform_impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resource/csdk/stack/include/internal/ocresource.h
index
bbd652b
,
01611c1
..
bbd652b
mode 100755,100644..100644
---
1
/
resource/csdk/stack/include/internal/ocresource.h
---
2
/
resource/csdk/stack/include/internal/ocresource.h
+++ b/
resource/csdk/stack/include/internal/ocresource.h
diff --cc
resource/csdk/stack/include/internal/ocresourcehandler.h
index
f56769c
,
505a598
..
f56769c
mode 100755,100644..100644
---
1
/
resource/csdk/stack/include/internal/ocresourcehandler.h
---
2
/
resource/csdk/stack/include/internal/ocresourcehandler.h
+++ b/
resource/csdk/stack/include/internal/ocresourcehandler.h
diff --cc
resource/csdk/stack/src/occollection.c
index
5d486bf
,
23980ba
..
5d486bf
mode 100755,100644..100644
---
1
/
resource/csdk/stack/src/occollection.c
---
2
/
resource/csdk/stack/src/occollection.c
+++ b/
resource/csdk/stack/src/occollection.c
diff --cc
resource/csdk/stack/src/oicgroup.c
index
b9f70ac
,
35819d8
..
b9f70ac
mode 100755,100644..100644
---
1
/
resource/csdk/stack/src/oicgroup.c
---
2
/
resource/csdk/stack/src/oicgroup.c
+++ b/
resource/csdk/stack/src/oicgroup.c
diff --cc
resource/include/OCApi.h
index
b523da5
,
f46dac0
..
b523da5
mode 100755,100644..100644
---
1
/
resource/include/OCApi.h
---
2
/
resource/include/OCApi.h
+++ b/
resource/include/OCApi.h
diff --cc
resource/src/InProcServerWrapper.cpp
index
0159bb8
,
9dbaa27
..
0159bb8
mode 100755,100644..100644
---
1
/
resource/src/InProcServerWrapper.cpp
---
2
/
resource/src/InProcServerWrapper.cpp
+++ b/
resource/src/InProcServerWrapper.cpp
diff --cc
resource/src/OCPlatform_impl.cpp
index
9d9ae52
,
e680943
..
9d9ae52
mode 100755,100644..100644
---
1
/
resource/src/OCPlatform_impl.cpp
---
2
/
resource/src/OCPlatform_impl.cpp
+++ b/
resource/src/OCPlatform_impl.cpp