projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d599f49
477e61b
)
Merge "[CA] [All] URI support , Optimization , License verification" into connectivit...
author
sudarshan prasad
<sudarshan.prasad@intel.com>
Sat, 20 Dec 2014 07:35:47 +0000
(23:35 -0800)
committer
Gerrit Code Review
<gerrit@oicreview.vlan14.01.org>
Sat, 20 Dec 2014 07:35:47 +0000
(23:35 -0800)
1
2
resource/csdk/connectivity/samples/linux/sample_main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resource/csdk/connectivity/samples/linux/sample_main.c
Simple merge