Merge 15268:15329 from trunk
authorCasper Hornstrup <chorns@users.sourceforge.net>
Mon, 16 May 2005 12:32:10 +0000 (12:32 +0000)
committerCasper Hornstrup <chorns@users.sourceforge.net>
Mon, 16 May 2005 12:32:10 +0000 (12:32 +0000)
commit3d5d32ed3673866f80fa499e18590a4ac1ce5510
treedabc8cbb37e757f4099ae464b87621efff71eaa2
parent5673e6c39d0c550f8caa915e93413481a4c49ae9
parent6b86cb440697e80640df8ee7bfcf46296a4080b1
Merge 15268:15329 from trunk

svn path=/branches/xmlbuildsystem/; revision=15339
reactos/subsys/win32k/include/winsta.h
reactos/subsys/win32k/main/dllmain.c
reactos/subsys/win32k/ntuser/winsta.c