diff options
author | RJ Ryan <rryan@mixxx.org> | 2013-12-04 23:52:37 -0500 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2013-12-04 23:52:37 -0500 |
commit | 55c2d9f3e5ab37418b7f3d8464d166f829791ad1 (patch) | |
tree | 43022cd6a99910708247ad7c3ed73229e080cabc /build/debian | |
parent | 31bcdb72b44bef4b13535b473583b79ce68e8045 (diff) | |
parent | c2c603b58ee801c2a34f46334daaa5e98f535890 (diff) |
Merge branch 'master' into features_key
Diffstat (limited to 'build/debian')
-rw-r--r-- | build/debian/control | 4 | ||||
-rw-r--r-- | build/debian/control.lucid | 4 | ||||
-rw-r--r-- | build/debian/control.maverick | 4 | ||||
-rw-r--r-- | build/debian/control.natty | 4 | ||||
-rw-r--r-- | build/debian/control.oneiric | 4 | ||||
-rw-r--r-- | build/debian/control.precise | 4 | ||||
-rw-r--r-- | build/debian/control.raring | 4 | ||||
-rw-r--r-- | build/debian/control.saucy | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/build/debian/control b/build/debian/control index e51b7edb0e..f555534907 100644 --- a/build/debian/control +++ b/build/debian/control @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.lucid b/build/debian/control.lucid index e59c7b6b4a..e6c7b406ec 100644 --- a/build/debian/control.lucid +++ b/build/debian/control.lucid @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.maverick b/build/debian/control.maverick index 7675d01e30..2243b52a59 100644 --- a/build/debian/control.maverick +++ b/build/debian/control.maverick @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.natty b/build/debian/control.natty index 0dc374967e..110923fb96 100644 --- a/build/debian/control.natty +++ b/build/debian/control.natty @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.oneiric b/build/debian/control.oneiric index 5c244f72d3..509f630753 100644 --- a/build/debian/control.oneiric +++ b/build/debian/control.oneiric @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.precise b/build/debian/control.precise index 0dc374967e..110923fb96 100644 --- a/build/debian/control.precise +++ b/build/debian/control.precise @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.raring b/build/debian/control.raring index 2b63619515..12e1e7d312 100644 --- a/build/debian/control.raring +++ b/build/debian/control.raring @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries diff --git a/build/debian/control.saucy b/build/debian/control.saucy index 2b63619515..12e1e7d312 100644 --- a/build/debian/control.saucy +++ b/build/debian/control.saucy @@ -19,9 +19,9 @@ Description: Free Digital DJ software. Start making live DJ mixes today. mixes. Blend songs together with automatic BPM matching and remix on-the-fly with looping and hot cues. Whether you're a pro DJ or just getting started, Mixxx has you covered. - + . Mixxx works with ALSA, JACK, OSS and supports many popular DJ controllers. - + . Features include: - Parallel or split scratchable waveform displays - Waveform summaries |