projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
128d46e
14c5508
)
Merge remote-tracking branch 'origin/2.0'
author
Olivier Goffart
<ogoffart@woboq.com>
Sat, 5 Sep 2015 16:14:30 +0000
(18:14 +0200)
committer
Olivier Goffart
<ogoffart@woboq.com>
Sat, 5 Sep 2015 16:14:30 +0000
(18:14 +0200)
1
2
src/gui/application.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/gui/application.cpp
Simple merge