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

Sync up with trunk r61578.

2014-01-11 00:00:10 +00:00

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

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

pch.h

* Sync up to trunk HEAD (r62286).

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

sys-stubs.S

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

w32ksvc.db

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

w32ksvc.h

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

win32k.h

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

win32k.rc

Sync up with trunk r61578.

2014-01-11 00:00:10 +00:00

win32k.spec

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00

win32kp.h

Create a branch for Aleksandar Andrejevic for his work on NTVDM. See http://jira.reactos.org/browse/CORE-7250 for more details.

2013-06-16 22:01:41 +00:00