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

Merge branch 'master' into 'glist_grab_exclusive_focus_and_shift' 

* Addresses conflict that has emerged due to prior gatom commit.

# Conflicts:
#   pd/src/g_text.c
parents 6a0694b0 b363df22
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 366 additions and 1927 deletions
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