[chronojump: 4/4] Merge branch 'update-database-before-importing'

[Carles Pina i Estany <carlespina src gnome org>]

commit f8325e75952e69e64419b4a2b457f79d6ba238f6
Merge: e0b329c 1e9749a
Author: Carles Pina i Estany <carles pina cat>
Date:   Fri Sep 30 12:59:56 2016 +0200

    Merge branch 'update-database-before-importing'

 chronojump.csproj                                  |    1 +
 src/Makefile.am                                    |    1 +
 src/chronojump-importer/chronojump_importer.py     |    2 +-
 .../chronojump_importer_test.py                    |    5 ++
 src/chronojump-importer/tests/yoyo-expected.sqlite |  Bin 1772544 -> 1772544 bytes
 src/chronojump.cs                                  |    6 ++-
 src/chronojumpImporter.cs                          |   46 ++++++++++---
 src/sqlite/main.cs                                 |   32 ++++++++-
 src/staticClassState.cs                            |   73 ++++++++++++++++++++
 9 files changed, 153 insertions(+), 13 deletions(-)
---