[chronojump/shortsLibrary: 13/14] Merge branch 'master' into shortsLibrary
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/shortsLibrary: 13/14] Merge branch 'master' into shortsLibrary
- Date: Mon, 11 Jan 2021 17:39:56 +0000 (UTC)
commit 2d149c0d2554a22c40daab7196ec81d178e9cf62
Merge: b5a99b06 6b37a1cf
Author: Xavier Padullés <testing chronojump org>
Date: Mon Jan 11 15:04:07 2021 +0100
Merge branch 'master' into shortsLibrary
glade/app1.glade | 449 +-
...apps_6_black_24dp.png => apps_6_black_24dp.png} | Bin
...e_apps_6_blue_24dp.png => apps_6_blue_24dp.png} | Bin
...ated_blue_24dp.png => apps_6_sep_blue_24dp.png} | Bin
...e_24dp.png => apps_6_sep_encoder_blue_24dp.png} | Bin
...lue_24dp.png => apps_6_sep_force_blue_24dp.png} | Bin
...blue_24dp.png => apps_6_sep_jump_blue_24dp.png} | Bin
...lue_24dp.png => apps_6_sep_other_blue_24dp.png} | Bin
...t_blue_24dp.png => apps_6_sep_rt_blue_24dp.png} | Bin
..._blue_24dp.png => apps_6_sep_run_blue_24dp.png} | Bin
...back_blue_24dp.png => arrow_back_blue_24dp.png} | Bin
..._blue_24dp.png => arrow_backward_blue_24dp.png} | Bin
...d_blue_24dp.png => arrow_forward_blue_24dp.png} | Bin
...ard_red_24dp.png => arrow_forward_red_24dp.png} | Bin
..._24dp.png => arrow_forward_red_yellow_24dp.png} | Bin
...ment_blue_24dp.png => attachment_blue_24dp.png} | Bin
...k_box_blue_24dp.png => check_box_blue_24dp.png} | Bin
...grid_on_blue_24dp.png => grid_on_blue_24dp.png} | Bin
...eline_help_blue_24dp.png => help_blue_24dp.png} | Bin
...png => ic_direct_race_encoder_blue_24dp_1x.png} | Bin
...g => ic_direct_race_encoder_yellow_24dp_1x.png} | Bin
..._24dp_1x.png => ic_direct_run_blue_24dp_1x.png} | Bin
..._24dp_2x.png => ic_direct_run_blue_24dp_2x.png} | Bin
...png => ic_direct_run_multiple_blue_24dp_1x.png} | Bin
...g => ic_direct_run_multiple_yellow_24dp_1x.png} | Bin
...ng => ic_direct_run_photocell_blue_24dp_2x.png} | Bin
...x.png => ic_direct_run_simple_blue_24dp_1x.png} | Bin
...png => ic_direct_run_simple_yellow_24dp_1x.png} | Bin
...1x.png => ic_direct_run_track_blue_24dp_1x.png} | Bin
...yboard_blue_24dp.png => keyboard_blue_24dp.png} | Bin
...st_alt_blue_24dp.png => list_alt_blue_24dp.png} | Bin
...ne_blue_24dp.png => mail_outline_blue_24dp.png} | Bin
...eline_menu_blue_24dp.png => menu_blue_24dp.png} | Bin
..._book_blue_24dp.png => menu_book_blue_24dp.png} | Bin
...oriz_blue_24dp.png => more_horiz_blue_24dp.png} | Bin
...es_blue_24dp.png => new_releases_blue_24dp.png} | Bin
...o_red_24dp.png => photo_camera_do_red_24dp.png} | Bin
...lue_24dp.png => photo_camera_end_blue_24dp.png} | Bin
...24dp.png => photo_camera_preview_blue_24dp.png} | Bin
...e_24dp.png => photo_camera_start_blue_24dp.png} | Bin
...rrow_blue_24dp.png => play_arrow_blue_24dp.png} | Bin
...blue_24dp.png => portrait_search_blue_24dp.png} | Bin
...eline_save_blue_24dp.png => save_blue_24dp.png} | Bin
...ine_store_blue_24dp.png => store_blue_24dp.png} | Bin
...blue_news_24dp.png => store_blue_news_24dp.png} | Bin
...store_yellow_24dp.png => store_yellow_24dp.png} | Bin
...warning_blue_24dp.png => warning_blue_24dp.png} | Bin
...e_warning_red_24dp.png => warning_red_24dp.png} | Bin
po/cs.po | 423 +-
po/ro.po | 148 +-
po/sv.po | 6472 +++++++++++---------
r-scripts/sprintEncoder.R | 3 +
src/Makefile.am | 86 +-
src/chronojump.cs | 2 +-
src/gui/app1/jumpsProfile.cs | 5 +-
src/gui/cairo/jumpsProfile.cs | 23 +-
src/gui/sendLog.cs | 10 +-
src/json/compujump.cs | 2 +-
src/jumpsProfile.cs | 23 +-
59 files changed, 4047 insertions(+), 3599 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]