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/mixerdata.cpp

    r8493 r21916  
    1717/******************************************************************************/
    1818/******************************************************************************/
    19 char *szCtrlName[MIX_CTRL_MAX][2] = {
     19const char *szCtrlName[MIX_CTRL_MAX][2] = {
    2020    {
    2121        "MasterVol",
    … …  
    201201/******************************************************************************/
    202202/******************************************************************************/
    203 char *szDestName[MIXER_DEST_MAX][2] = {
     203const char *szDestName[MIXER_DEST_MAX][2] = {
    204204  {
    205205      "Volume Control",
    … …  
    217217/******************************************************************************/
    218218/******************************************************************************/
    219 char *szSourceName[MIXER_SRC_MAX][2] = {
     219const char *szSourceName[MIXER_SRC_MAX][2] = {
    220220  {
    221221      "MonoIn",
Note: See TracChangeset for help on using the changeset viewer.