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/shell32/shv_bg_cmenu.c

    r8614 r21916  
    212212            IShellFolder *psfFrom = NULL, *psfDesktop;
    213213
    214             LPCIDA lpcida = GlobalLock(medium.u.hGlobal);
     214            LPCIDA lpcida = GlobalLock(medium.DUMMYUNIONNAME_DOT hGlobal);
    215215            TRACE("cida=%p\n", lpcida);
    216216           
Note: See TracChangeset for help on using the changeset viewer.