diff options
| author | RJ Ryan <rryan@mixxx.org> | 2013-06-19 01:12:50 -0400 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2013-06-19 01:12:50 -0400 |
| commit | 52d6c28ded7b3d7e9ae3874fc893c6b306147931 (patch) | |
| tree | a2729bd5686b5c13684510d0196862a76c8aedab /src | |
| parent | f62fd9ee125cbd22be97ce5f837f30b8ef443842 (diff) | |
| parent | 25d57b59dff3947212909634864dd82365c9606b (diff) | |
Merge branch 'master' into features_effects
Conflicts:
res/skins/Outline1024x600-Netbook/keylock-off-Ch1.png
res/skins/Outline1024x600-Netbook/keylock-off-Ch2.png
res/skins/Outline1024x600-Netbook/keylock-on-Ch1.png
res/skins/Outline1024x600-Netbook/keylock-on-Ch2.png
Diffstat (limited to 'src')