diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2014-08-31 22:44:33 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2014-08-31 22:44:33 +0200 |
| commit | 51addfb8a05d6c33e99b84587eeb19f86333e684 (patch) | |
| tree | acc59c1a80811e551ebf12c5b93138d8f2bd09fe /SConstruct | |
| parent | 591e54a70b6f055e194a73cac796383d6f36cc6e (diff) | |
| parent | 3e4b3ec6acc4b687476f16e72b628e9207210c00 (diff) | |
Merge remote-tracking branch 'upstream/master' into localeCompare
Conflicts:
build/features.py
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index cb749cd013..a5d4118bc7 100644 --- a/SConstruct +++ b/SConstruct @@ -38,6 +38,7 @@ available_features = [features.Mad, features.HSS1394, features.HID, features.Bulk, + features.MacAppStoreException, features.VinylControl, features.Shoutcast, features.Opus, |