projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9919d4f
a381da4
)
Fix merge r65567.
author
Hermès Bélusca-Maïto
<hermes.belusca-maito@reactos.org>
Fri, 5 Dec 2014 22:24:49 +0000
(22:24 +0000)
committer
Hermès Bélusca-Maïto
<hermes.belusca-maito@reactos.org>
Fri, 5 Dec 2014 22:24:49 +0000
(22:24 +0000)
svn path=/branches/condrv_restructure/; revision=65570
1
2
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/history.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/init.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/popup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/history.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/init.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/popup.c
Simple merge