Reintegrate header-work branch. Important changes include continued work on headers...
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 9 Jun 2010 22:24:32 +0000 (22:24 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 9 Jun 2010 22:24:32 +0000 (22:24 +0000)
svn path=/trunk/; revision=47727

139 files changed:
1  2 
reactos/base/applications/network/netstat/netstat.c
reactos/base/setup/vmwinst/vmwinst.c
reactos/boot/freeldr/freeldr.rbuild
reactos/boot/freeldr/freeldr/arch/arm/macharm.c
reactos/boot/freeldr/freeldr/bootmgr.c
reactos/boot/freeldr/freeldr/freeldr.c
reactos/dll/win32/advapi32/misc/trace.c
reactos/dll/win32/kernel32/k32.h
reactos/dll/win32/msafd/misc/dllmain.c
reactos/dll/win32/msafd/msafd.h
reactos/dll/win32/rpcrt4/unix_func.h
reactos/dll/win32/version/resource.c
reactos/dll/win32/ws2_32/misc/async.c
reactos/dll/win32/ws2_32/ws2_32.rbuild
reactos/drivers/base/kdcom/arm/kdbg.c
reactos/drivers/base/kdcom/i386/kdbg.c
reactos/drivers/battery/battc/battc.h
reactos/drivers/network/ndis/ndis/buffer.c
reactos/drivers/video/miniport/vbe/vbemp.c
reactos/drivers/video/miniport/vga/vgamp.c
reactos/drivers/video/miniport/vmx_svga/vmx_svga.c
reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
reactos/drivers/video/videoprt/videoprt.c
reactos/drivers/wmi/wmilib.c
reactos/hal/hal.pspec
reactos/include/crt/mingw32/intrin_arm.h
reactos/include/ddk/atm.h
reactos/include/ddk/csq.h
reactos/include/ddk/d4drvif.h
reactos/include/ddk/d4iface.h
reactos/include/ddk/dciddi.h
reactos/include/ddk/dderror.h
reactos/include/ddk/dxapi.h
reactos/include/ddk/fltsafe.h
reactos/include/ddk/kbdmou.h
reactos/include/ddk/miniport.h
reactos/include/ddk/mountdev.h
reactos/include/ddk/mountmgr.h
reactos/include/ddk/ndis.h
reactos/include/ddk/ndisguid.h
reactos/include/ddk/ndiswan.h
reactos/include/ddk/netpnp.h
reactos/include/ddk/ntagp.h
reactos/include/ddk/ntddk.h
reactos/include/ddk/ntifs.h
reactos/include/ddk/scsi.h
reactos/include/ddk/srb.h
reactos/include/ddk/video.h
reactos/include/ddk/videoagp.h
reactos/include/ddk/wdm.h
reactos/include/ddk/wmidata.h
reactos/include/ddk/ws2san.h
reactos/include/ndk/rtltypes.h
reactos/include/psdk/batclass.h
reactos/include/psdk/compstui.h
reactos/include/psdk/devioctl.h
reactos/include/psdk/evntrace.h
reactos/include/psdk/in6addr.h
reactos/include/psdk/inaddr.h
reactos/include/psdk/iptypes.h
reactos/include/psdk/kcom.h
reactos/include/psdk/ksdebug.h
reactos/include/psdk/ksuuids.h
reactos/include/psdk/lmon.h
reactos/include/psdk/mstcpip.h
reactos/include/psdk/mswsock.h
reactos/include/psdk/mswsockdef.h
reactos/include/psdk/nettypes.h
reactos/include/psdk/newdev.h
reactos/include/psdk/nspapi.h
reactos/include/psdk/ntddchgr.h
reactos/include/psdk/ntddkbd.h
reactos/include/psdk/ntddmou.h
reactos/include/psdk/ntddstor.h
reactos/include/psdk/qos.h
reactos/include/psdk/winddi.h
reactos/include/psdk/winddiui.h
reactos/include/psdk/winioctl.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winsock.h
reactos/include/psdk/winsock2.h
reactos/include/psdk/winsplp.h
reactos/include/psdk/winspool.h
reactos/include/psdk/winuser.h
reactos/include/psdk/ws2bth.h
reactos/include/psdk/ws2def.h
reactos/include/psdk/ws2ipdef.h
reactos/include/psdk/ws2spi.h
reactos/include/psdk/ws2tcpip.h
reactos/include/psdk/wsipv6ok.h
reactos/include/psdk/wspiapi.h
reactos/include/reactos/arm/armddk.h
reactos/include/reactos/wine/dcetypes.idl
reactos/include/reactos/wine/ddk/compstui.h
reactos/include/reactos/wine/ddk/winddiui.h
reactos/include/reactos/wine/ddk/winsplp.h
reactos/include/xdk/amd64/ke.h
reactos/include/xdk/ccfuncs.h
reactos/include/xdk/cctypes.h
reactos/include/xdk/cmfuncs.h
reactos/include/xdk/cmtypes.h
reactos/include/xdk/devioctl.template.h
reactos/include/xdk/exfuncs.h
reactos/include/xdk/extypes.h
reactos/include/xdk/fsrtlfuncs.h
reactos/include/xdk/fsrtltypes.h
reactos/include/xdk/generate.bat
reactos/include/xdk/halfuncs.h
reactos/include/xdk/haltypes.h
reactos/include/xdk/iofuncs.h
reactos/include/xdk/iotypes.h
reactos/include/xdk/kefuncs.h
reactos/include/xdk/ketypes.h
reactos/include/xdk/mmfuncs.h
reactos/include/xdk/mmtypes.h
reactos/include/xdk/ntddk.template.h
reactos/include/xdk/ntifs.template.h
reactos/include/xdk/obfuncs.h
reactos/include/xdk/obtypes.h
reactos/include/xdk/pofuncs.h
reactos/include/xdk/potypes.h
reactos/include/xdk/psfuncs.h
reactos/include/xdk/pstypes.h
reactos/include/xdk/rtlfuncs.h
reactos/include/xdk/rtltypes.h
reactos/include/xdk/sefuncs.h
reactos/include/xdk/setypes.h
reactos/include/xdk/wdm.template.h
reactos/include/xdk/zwfuncs.h
reactos/lib/3rdparty/libxml2/config.h
reactos/ntoskrnl/ex/fastinterlck.c
reactos/ntoskrnl/include/internal/amd64/ke.h
reactos/ntoskrnl/include/internal/amd64/mm.h
reactos/ntoskrnl/include/internal/arm/ke.h
reactos/ntoskrnl/include/internal/arm/mm.h
reactos/ntoskrnl/include/internal/i386/ke.h
reactos/ntoskrnl/include/internal/i386/mm.h
reactos/ntoskrnl/include/internal/powerpc/ke.h
reactos/ntoskrnl/mm/ARM3/miarm.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,4c72b31..4c72b31
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,fd42773..fd42773
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,2e65537..2e65537
mode 000000,100644..100644
--- /dev/null
index 0000000,3eb0dd8..3eb0dd8
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,2d25e70..2d25e70
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,6303cf4..6303cf4
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,d73ba47..d73ba47
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,38a98ed..38a98ed
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,dbe96cb..dbe96cb
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,b995025..b995025
mode 000000,100644..100644
--- /dev/null
index 0000000,4b4b5ce..4b4b5ce
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,ff15927..ff15927
mode 000000,100644..100644
--- /dev/null
index 0000000,972abb7..972abb7
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,ac7e130..ac7e130
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,05fdb7e..05fdb7e
mode 000000,100644..100644
--- /dev/null
index 0000000,cc67884..cc67884
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,d374331..d374331
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge