Merge branch 'bug-700448-load-error'.
commit31440e054a54001bf462f7da9d31bfc0f0063d3f
authorPeter TB Brett <peter@peter-b.co.uk>
Mon, 9 Jan 2012 20:13:41 +0000 (9 20:13 +0000)
committerPeter TB Brett <peter@peter-b.co.uk>
Mon, 9 Jan 2012 20:13:41 +0000 (9 20:13 +0000)
tree7014a933a9b1ca3d2642a90d7076d9cb77d4af06
parentc6db15997c306c23c02dec9cc8f1e9a645f03fcb
parent08844256caf27c2ac0be8614388f6e30c034437d
Merge branch 'bug-700448-load-error'.

Eivind Kvedalen has provided some changes to libgeda and tools that
provide better error detection when loading schematic and symbol
files, and I have made a few improvements and bugfixes based on his
branch.

Closes-bug: lp-700448

Conflicts:
libgeda/src/a_basic.c
libgeda/include/libgeda/prototype.h
libgeda/include/prototype_priv.h
libgeda/src/a_basic.c
libgeda/src/o_attrib.c
libgeda/src/o_net_basic.c
libgeda/src/o_picture.c
libgeda/src/o_text_basic.c