Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/wintrust/wintrust.def

    r7624 r21916  
    5252;;address 0x6a70 WTHelperProvDataFromStateData @42 (0x20153a70)
    5353
    54   WinVerifyTrust = _WinVerifyTrust@12                                @43
     54  WinVerifyTrust = "_WinVerifyTrust@12"                              @43
    5555
    5656;;address 0x5cb5 WinVerifyTrustEx @44 (0x20152cb5)
Note: See TracChangeset for help on using the changeset viewer.