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/shdocvw/oleobject.c

    r6712 r21916  
    236236 * WBOOBJ_DoVerb (IOleObject)
    237237 */
    238 static HRESULT WINAPI WBOOBJ_DoVerb(LPOLEOBJECT iface, LONG iVerb, struct tagMSG* lpmsg,
     238static HRESULT WINAPI WBOOBJ_DoVerb(LPOLEOBJECT iface, LONG iVerb, LPMSG lpmsg,
    239239                                    LPOLECLIENTSITE pActiveSite, LONG lindex,
    240240                                    HWND hwndParent, LPCRECT lprcPosRect)
Note: See TracChangeset for help on using the changeset viewer.