[wxsqlite3/f21: 3/3] update to 3.2.0

[Martin Gansser]

commit 8d7f812dc3d74e98c55f7a6d1d326ed5acfee956
Merge: a3a65a5 004f1df
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 12:01:00 2015 +0100

    update to 3.2.0

 sources |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc sources
index 0038c80,214c389..30ea2dd
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,5 @@@
  97ed1ec2f5a37db37d1c19afdb4164c9  wxsqlite3-3.0.3.pc.in
++<<<<<<< HEAD
++=======
+ 618476322516de436c770a2fe405e26e  wxsqlite3-3.2.0.tar.gz
++>>>>>>> master