diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2013-07-08 00:45:26 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2013-07-08 00:45:26 +0200 |
| commit | 6735fbcabce107b5d0217295895bb7473ba74200 (patch) | |
| tree | 3e9f362646f9b551a56ddea7d7271633ad3c1159 /SConstruct | |
| parent | 8df76ebc2a22cc399af56d971e78735fbfb3edf8 (diff) | |
| parent | 3a8528336e1493bb3a5d40d270d28c2e7a6c81fe (diff) | |
Merge branch 'master' into autodj-crates2
Conflicts:
src/dlgprefcontrolsdlg.ui
src/library/dao/cratedao.cpp
src/library/dao/cratedao.h
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index d52f8c09c0..3802d406e7 100644 --- a/SConstruct +++ b/SConstruct @@ -60,7 +60,6 @@ available_features = [features.HifiEq, # "Features" of dubious quality features.PerfTools, features.AsmLib, - features.Tonal, features.IPod, features.FFMPEG, ] |