# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rowan.jones-2012@brookes.ac.uk-20130508093951-\
# 7ivexwb628mk72tn
# target_branch: bzr+ssh://bazaar.launchpad.net/+branch/mixxx/
# testament_sha1: f85be932c1dbc3797343bfa9b8768a0fcd1b231f
# timestamp: 2013-05-08 11:16:10 +0100
# base_revision_id: rryan@mixxx.org-20130507052444-7gji3aoqk6cqo808
#
# Begin patch
=== modified file 'mixxx/SConstruct'
--- mixxx/SConstruct 2013-03-14 18:11:40 +0000
+++ mixxx/SConstruct 2013-05-03 14:47:07 +0000
@@ -26,6 +26,7 @@
import logging
logging.getLogger().setLevel(logging.DEBUG)
+
from build import mixxx, features, depends
target = ARGUMENTS.get('target', None)
machine = ARGUMENTS.get('machine', None)
=== modified file 'mixxx/res/skins/Deere1280x1024-SXGA/skin.xml'
--- mixxx/res/skins/Deere1280x1024-SXGA/skin.xml 2013-05-02 14:17:13 +0000
+++ mixxx/res/skins/Deere1280x1024-SXGA/skin.xml 2013-05-07 20:00:48 +0000
@@ -323,18 +323,56 @@
10,31
- [Sampler1],play
+ [Sampler1],start_play
true
LeftButton
- [Sampler1],start
+ [Sampler1],start_stop
true
RightButton
false
-
+
+
+
+ play_mode
+
+ 4
+ true
+
+ 0
+ btn_hotcue1_1_down.png
+ btn_hotcue1_1.png
+
+
+ 1
+ btn_hotcue1_2_down.png
+ btn_hotcue1_2.png
+
+
+ 2
+ btn_hotcue1_3_down.png
+ btn_hotcue1_3.png
+
+
+ 3
+ btn_hotcue1_4_down.png
+ btn_hotcue1_4.png
+
+ 10,71
+
+ [Sampler1],play_mode
+ true
+ LeftButton
+
+
+