projects
/
platform
/
upstream
/
smack.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f877814
e04ccf3
)
Merge remote-tracking branch 'tizen/upstream' into tizen
24/33424/1
author
Rafal Krypa
<r.krypa@samsung.com>
Fri, 9 Jan 2015 10:41:44 +0000
(11:41 +0100)
committer
Rafal Krypa
<r.krypa@samsung.com>
Fri, 9 Jan 2015 10:42:38 +0000
(11:42 +0100)
Change-Id: Ib8d978e8e9f223c8b76b52e6e0e04ce0949cf5a2
1
2
libsmack/libsmack.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libsmack/libsmack.c
Simple merge