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

Merge branch 'gsoc2013' into serialization 

Conflicts:
	gxml/Node.vala
	gxml/NodeList.vala
	gxml/Serializable.vala
	gxml/Serialization.vala
	test/SerializableTest.vala
parents 2a33ba7e 69f18f19
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