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/winmm/auxos2.cpp

    r7196 r21916  
    2828
    2929#include "auxiliary.h"
    30 #include "initwinmm.h"
     30#include "initterm.h"
    3131
    3232#define DBG_LOCALLOG    DBG_auxos2
Note: See TracChangeset for help on using the changeset viewer.