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

Fixing merging 'master' and 'serializable' branches. 

* All Unit tests pass
* Resolved conflicts between GLib.Error and GXml.Error
* Added to CLEANFILES all generated .c files
parent db534563
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