[chronojump: 4/4] Merge branch 'chronojump-importer-warn-database-version'

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

commit 9f208f639101a9c4713421455c4d92abf356fb21
Merge: b84fa71 835833d
Author: Carles Pina i Estany <carles pina cat>
Date:   Thu Sep 29 23:43:21 2016 +0200

    Merge branch 'chronojump-importer-warn-database-version'

 chronojump.csproj                                  |    1 +
 src/Makefile.am                                    |    1 +
 src/chronojump-importer/chronojump_importer.py     |   27 ++-
 .../chronojump_importer_test.py                    |    6 +
 src/chronojumpImporter.cs                          |  199 ++++++++++++++++++++
 src/commandLineEncoder.cs                          |    2 +-
 src/gui/chronojump.cs                              |   66 +------
 7 files changed, 236 insertions(+), 66 deletions(-)
---