Merge branch 'soundfiler-fixes' (16973649) · Commits · Devesh Prasad / purr-data · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

purr-data
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

16973649

Commit 16973649 authored 7 years ago by Jonathan Wilkes

Downloads
- Plain Diff

Merge branch 'soundfiler-fixes'

Conflicts:
	pd/src/m_pd.h

parents 15094e4c a4782de2

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 3 additions, 0 deletions

.gitmodules
externals/Makefile 14 additions, 4 deletions

externals/Makefile
externals/cyclone 1 addition, 0 deletions

externals/cyclone
externals/unauthorized/grid.c 19 additions, 14 deletions

externals/unauthorized/grid.c
pd/nw/dialog_external.html 53 additions, 34 deletions

pd/nw/dialog_external.html
pd/nw/pdgui.js 34 additions, 2 deletions

pd/nw/pdgui.js
pd/src/d_array.c 2 additions, 0 deletions

pd/src/d_array.c
pd/src/d_soundfile.c 57 additions, 40 deletions

pd/src/d_soundfile.c
pd/src/g_array.c 17 additions, 8 deletions

pd/src/g_array.c
pd/src/g_editor.c 5 additions, 5 deletions

pd/src/g_editor.c
pd/src/m_pd.h 2 additions, 1 deletion

pd/src/m_pd.h

with 207 additions and 108 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment