Merge branch 'master' of github.com:wine-compholio/wine-staging

This commit is contained in:
Sebastian Lackner 2014-12-18 22:44:36 +01:00
commit d2c32c103a
2 changed files with 1 additions and 2 deletions

View File

@ -1003,7 +1003,7 @@ ntdll-Heap_FreeLists.ok:
# | include/ntifs.h
# |
.INTERMEDIATE: ntdll-Junction_Points.ok
ntdll-Junction_Points.ok: ntdll-DOS_Attributes.ok ntdll-Fix_Free.ok
ntdll-Junction_Points.ok: ntdll-Fix_Free.ok
$(call APPLY_FILE,ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch)
$(call APPLY_FILE,ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch)
$(call APPLY_FILE,ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch)

View File

@ -1,3 +1,2 @@
Depends: ntdll-Fix_Free
Depends: ntdll-DOS_Attributes
Fixes: [12401] Support for Junction Points