Skip to content
Commit 88e9043a authored by Daniel Espinosa's avatar Daniel Espinosa
Browse files

Merge branch 'newattr' into serialization 

Conflicts:
	gxml/Makefile.am
	gxml/NamespaceAttr.vala
	test/GXmlTest.vala
	test/Makefile.am
parents 05b08af3 d2a5ab9e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment