Skip to content
Commit ca240160 authored by Andrés G. Aragoneses's avatar Andrés G. Aragoneses
Browse files

Merge branch 'gtk3' 

Conflicts:
	build/m4/banshee/gio.m4
	configure.ac
	src/Hyena
parents 2f088f3c 3a72268f
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