[chronojump/chronojump-importer: 61/66] Merge branch 'master' into chronojump-importer

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

commit 747dbbf65001ea496e41778a631ea632a2b01e33
Merge: 99a7e59 11470f5
Author: Carles Pina i Estany <carles pina cat>
Date:   Sat Sep 24 23:11:06 2016 +0200

    Merge branch 'master' into chronojump-importer
    
    Conflicts:
        glade/chronojump.glade

 diagrams/classes/chronopicConnection.dia |  Bin 0 -> 5250 bytes
 encoder/graph.R                          |   40 +-
 glade/chronojump.glade                   | 7433 +++++++++++++++++++-----------
 images/stock_down.png                    |  Bin 0 -> 519 bytes
 images/stock_inertial.png                |  Bin 0 -> 802 bytes
 images/svg/stock_menu_buttons.svg        |  240 +-
 po/POTFILES.in                           |   14 +-
 po/POTFILES.skip                         |    4 +-
 po/cs.po                                 | 4025 +++++++++--------
 po/hu.po                                 | 2433 +++++-----
 po/it.po                                 | 3638 ++++++++-------
 po/sr.po                                 | 3738 +++++++++-------
 src/Makefile.am                          |    5 +
 src/chronopicDetect.cs                   |    6 +-
 src/constants.cs                         |   27 +-
 src/encoder.cs                           |   14 -
 src/gui/chronojump.cs                    |  758 ++--
 src/gui/chronopic.cs                     |    6 +
 src/gui/chronopicWizard.cs               |  416 ++
 src/gui/encoder.cs                       |  292 +-
 src/gui/encoderTreeviews.cs              |    2 +-
 src/gui/eventExecute.cs                  |   15 +-
 src/gui/movingStartWindow.cs             |  173 +
 src/gui/old/chronojumpServerOld.cs       |  314 ++
 src/gui/preferences.cs                   |    4 +-
 src/gui/repetitiveConditions.cs          |   35 +
 src/gui/usefulObjects.cs                 |   50 +
 src/preferences.cs                       |   23 +
 src/treeViewJump.cs                      |    5 +-
 src/utilMath.cs                          |  107 +-
 30 files changed, 14066 insertions(+), 9751 deletions(-)
---