diff options
| author | Bruno Wolff III <bruno@wolff.to> | 2013-06-27 23:39:25 -0500 |
|---|---|---|
| committer | Bruno Wolff III <bruno@wolff.to> | 2013-06-27 23:39:25 -0500 |
| commit | 3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1 (patch) | |
| tree | 79a799544fb6b9ceadfcc00dbb830fd74dbf4c29 | |
| parent | 4c054d7a11d897db0fdbd0c557a4dded64202c20 (diff) | |
| parent | 96833b75f97d270a6057771f1b4a9da636350a83 (diff) | |
| download | spin-kickstarts-3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1.tar.gz spin-kickstarts-3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1.tar.xz spin-kickstarts-3cfde69cd0ee06f70b8b06fbd77538e6d78cd3d1.zip | |
Merge remote-tracking branch 'origin/f19' into f19
Conflicts:
configure.ac
spin-kickstarts.spec.in
| -rw-r--r-- | fedora-live-jam-kde.ks | 3 | ||||
| -rw-r--r-- | fedora-livedvd-scientific-kde.ks | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam-kde.ks index e874e22..9ea1612 100644 --- a/fedora-live-jam-kde.ks +++ b/fedora-live-jam-kde.ks @@ -85,7 +85,6 @@ non-session-manager # audio-plugins calf dssi -dssi-vst jack-rack ladspa @@ -117,7 +116,7 @@ lv2-c++-tools lv2-samplv1 lv2-synthv1 lv2-drumkv1 -slv2 + #dssi nekobee-dssi diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 8bb659e..97ead30 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -54,7 +54,6 @@ rkward qtoctave # IDEs for the IDE folks -netbeans eclipse spyder @@ -63,7 +62,6 @@ emacs emacs-color-theme vim scribus -scite lyx kile |