Skip to content
Snippets Groups Projects
Commit 515b4261 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

*fixed conflicts between Mathieu's and my own contributions 

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

Conflicts:
	pd/src/g_all_guis.c
	pd/src/g_vumeter.c
parents 0eea3541 5d6a6e09
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment