Aleksandar Andrejevic 5b74bbc251 Fix broken merge. ...

svn path=/branches/ntvdm/; revision=62850

2014-04-21 01:51:27 +00:00

..

drivers

Sync with trunk.

2014-04-21 01:45:58 +00:00

gdi

Sync with trunk.

2014-04-21 01:45:58 +00:00

include

…

reactx

* Sync up to trunk HEAD (r62286).

2014-02-22 10:50:51 +00:00

user

Fix broken merge.

2014-04-21 01:51:27 +00:00

CMakeLists.txt

* Sync up to trunk HEAD (r62286).

2014-02-22 10:50:51 +00:00

napi.h

…

pch.h

* Sync up to trunk HEAD (r62286).

2014-02-22 10:50:51 +00:00

sys-stubs.S

…

w32ksvc.db

…

w32ksvc.h

…

win32k.h

…

win32k.rc

…

win32k.spec

…

win32kp.h

…