← Back to branch summary

~mkas/mixxx/mysql

« back to all changes in this revision

Viewing changes to mixxx/src/controlvaluedelegate.cpp

  • Committer: MKas
  • Date: 2012-11-03 12:55:54 UTC
  • Revision ID: mkas@tux.lt-20121103125554-ez5ajqyk7bwehrp2
merge with trunk + sql fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/controlvaluedelegate.cpp
64
64
        m_channelControlValues.append("loop_in");
65
65
        m_channelControlValues.append("loop_out");
66
66
        m_channelControlValues.append("reloop_exit");
67
 
        m_channelControlValues.append("beatloop_4");
 
67
        m_channelControlValues.append("beatloop_4_toggle");
68
68
        m_channelControlValues.append("loop_halve");
69
69
        m_channelControlValues.append("loop_double");
70
70
        m_channelControlValues.append("hotcue_1_activate");