[beast: 8/8] Merge branch 'rapidres'
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 8/8] Merge branch 'rapidres'
- Date: Fri, 12 Jun 2015 21:26:50 +0000 (UTC)
commit 17dde42e3d1f303578fa0246cf54250877340799
Merge: b4b5943 45f53a8
Author: Tim Janik <timj gnu org>
Date: Fri Jan 30 06:02:59 2015 +0100
Merge branch 'rapidres'
* rapidres:
BEAST-GTK: res/: fix resource file paths
BSE: res/: fix resource file paths
BEAST-GTK: move resources into bse/res/
BSE: move resources into bse/res/
BSE: remove unused builtin synthesizer listing
BSE: use Rapicorn resources to compile and access BSE files
BEAST-GTK: use Rapicorn resources to compile and access dialog XML files
beast-gtk/Makefile.am | 2 +-
beast-gtk/bstutils.cc | 14 ++--
beast-gtk/dialogs/.gitignore | 1 -
beast-gtk/dialogs/Makefile.am | 24 ------
beast-gtk/res/.gitignore | 1 +
beast-gtk/res/Makefile.am | 20 +++++
beast-gtk/{dialogs => res}/radgets-beast.xml | 0
beast-gtk/{dialogs => res}/radgets-standard.xml | 0
bse/Makefile.am | 2 +-
bse/bsequery.cc | 14 +---
bse/bsestandardsynths.cc | 92 +++--------------------
bse/bsestandardsynths.hh | 1 -
bse/res/.gitignore | 1 +
bse/res/Makefile.am | 24 ++++++
bse/{zintern => res}/adsr-wave-1.bse | 0
bse/{zintern => res}/adsr-wave-2.bse | 0
bse/{zintern => res}/gus-patch.bse | 0
bse/{zintern => res}/plain-wave-1.bse | 0
bse/{zintern => res}/plain-wave-2.bse | 0
bse/zintern/.gitignore | 1 -
bse/zintern/Makefile.am | 40 ----------
configure.ac | 4 +-
po/POTSCAN | 4 +-
23 files changed, 69 insertions(+), 176 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]