projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b06af9e
54d0920
)
* Sync up to trunk head (r65095).
author
Amine Khaldi
<amine.khaldi@reactos.org>
Wed, 29 Oct 2014 11:25:42 +0000
(11:25 +0000)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Wed, 29 Oct 2014 11:25:42 +0000
(11:25 +0000)
* Thank you Kamil for r65087 ;)
svn path=/branches/shell-experiments/; revision=65096
25 files changed:
1
2
base/applications/network/net/cmdUser.c
patch
|
diff1
|
diff2
|
blob
|
history
base/system/winlogon/screensaver.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/finfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/volinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/storage/class/disk/disk.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/include/gdi32p.h
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/misc/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/misc/wingl.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/bitmap.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/brush.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/colorspace.c
patch
|
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/coord.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/dc.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/eng.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/enhmfile.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/font.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/gdiobj.c
patch
|
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/icm.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/metafile.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/painting.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/palette.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/printdrv.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/text.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/painting.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
base/applications/network/net/cmdUser.c
Simple merge
diff --cc
base/system/winlogon/screensaver.c
Simple merge
diff --cc
drivers/filesystems/fastfat/finfo.c
Simple merge
diff --cc
drivers/filesystems/ntfs/volinfo.c
Simple merge
diff --cc
drivers/storage/class/disk/disk.c
Simple merge
diff --cc
win32ss/gdi/gdi32/CMakeLists.txt
Simple merge
diff --cc
win32ss/gdi/gdi32/include/gdi32p.h
Simple merge
diff --cc
win32ss/gdi/gdi32/misc/misc.c
Simple merge
diff --cc
win32ss/gdi/gdi32/misc/wingl.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/bitmap.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/brush.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/colorspace.c
index 0000000,
14918ad
..
14918ad
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/win32ss/gdi/gdi32/objects/colorspace.c
+++ b/
win32ss/gdi/gdi32/objects/colorspace.c
diff --cc
win32ss/gdi/gdi32/objects/coord.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/dc.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/eng.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/enhmfile.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/font.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/gdiobj.c
index 0000000,
9343625
..
9343625
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/win32ss/gdi/gdi32/objects/gdiobj.c
+++ b/
win32ss/gdi/gdi32/objects/gdiobj.c
diff --cc
win32ss/gdi/gdi32/objects/icm.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/metafile.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/painting.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/palette.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/printdrv.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/text.c
Simple merge
diff --cc
win32ss/user/ntuser/painting.c
Simple merge