Merge branch 'master' of git://github.com/pd-l2ork/pd (5823c6d6) · Commits · brittney allen / purr-data · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

purr-data
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5823c6d6

Commit 5823c6d6 authored 10 years ago by Ivica Bukvic

Downloads
- Plain Diff

Merge branch 'master' of git://github.com/pd-l2ork/pd

Conflicts:
	pd/src/g_array.c

parents c68349c4 f96f9d5b

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

pd/src/g_all_guis.c 3 additions, 3 deletions

pd/src/g_all_guis.c
pd/src/g_array.c 1 addition, 2 deletions

pd/src/g_array.c
pd/src/g_canvas.h 1 addition, 0 deletions

pd/src/g_canvas.h
pd/src/g_editor.c 78 additions, 283 deletions

pd/src/g_editor.c
pd/src/g_graph.c 1 addition, 1 deletion

pd/src/g_graph.c
pd/src/g_rtext.c 3 additions, 6 deletions

pd/src/g_rtext.c
pd/src/g_scalar.c 2 additions, 2 deletions

pd/src/g_scalar.c
pd/src/g_template.c 1 addition, 1 deletion

pd/src/g_template.c
pd/src/g_text.c 12 additions, 13 deletions

pd/src/g_text.c
pd/src/g_undo.c 2 additions, 2 deletions

pd/src/g_undo.c
pd/src/pd.tk 6 additions, 13 deletions

pd/src/pd.tk

with 110 additions and 326 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