projects
/
profile
/
ivi
/
settings-daemon.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4f9248
56f4f12
)
Merge branch 'tizen' into devel
author
Ossama Othman
<ossama.othman@intel.com>
Wed, 9 Oct 2013 17:45:05 +0000
(10:45 -0700)
committer
Ossama Othman
<ossama.othman@intel.com>
Wed, 9 Oct 2013 17:45:05 +0000
(10:45 -0700)
1
2
lib/manager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/manager.cpp
Simple merge