projects
/
profile
/
mobile
/
apps
/
native
/
message.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d83298d
8749d8f
)
Merge branch 'tizen' into tizen_dev
86/78486/1
author
Andrey Klimenko
<and.klimenko@samsung.com>
Tue, 5 Jul 2016 16:01:30 +0000
(19:01 +0300)
committer
Andrey Klimenko
<and.klimenko@samsung.com>
Tue, 5 Jul 2016 16:01:38 +0000
(19:01 +0300)
Change-Id: Id9953e3dff2d6d31dc66dfb85803eff75743f3c7
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
1
2
src/Conversation/Main/Controller/src/Conversation.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Conversation/Main/Controller/src/Conversation.cpp
Simple merge