Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Build/Windows/README.txt
  • Loading branch information
dfober committed Jan 31, 2019
2 parents ec77156 + 02b380c commit 956e9a3
Show file tree
Hide file tree
Showing 171 changed files with 2,684 additions and 24,355 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Resources/Libs"]
path = Resources/Libs
url = https://github.com/grame-cncm/faustlibraries.git
1 change: 0 additions & 1 deletion Build/Darwin/Distributions/DefaultDSP.dsp

This file was deleted.

1 change: 0 additions & 1 deletion Build/Darwin/Distributions/DefaultDSP.lib

This file was deleted.

Binary file removed Build/Darwin/Distributions/JackOSX.0.92_b3.pkg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Build/Darwin/Distributions/Whats_New.docx
Binary file not shown.
Binary file removed Build/Darwin/Distributions/Whats_New.pdf
Binary file not shown.
42 changes: 0 additions & 42 deletions Build/Darwin/Distributions/process.svg

This file was deleted.

298 changes: 0 additions & 298 deletions Build/Darwin/FaustLive.pro

This file was deleted.

Loading

0 comments on commit 956e9a3

Please sign in to comment.