mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 22:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,932 Commits 2 Branches 9 Tags
d94ba3259b085cc3a558a3396e4a6f7fd72fac6d
Commit Graph

531 Commits

Author SHA1 Message Date
vanhofen
d607c32508 Revert "remove pinentered script , revert 2eab1fa453b1772c8da2a40baa8a15411e3e8852" 
This reverts commit d00ede022c.


Origin commit data
------------------
Commit: f6692bff58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:33:31 +01:00
vanhofen
1ae9a82620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:04:12 +01:00
Jacek Jendrzej
d00ede022c remove pinentered script , revert 2eab1fa453 
Origin commit data
------------------
Commit: ec10cd64e5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 12:25:14 +01:00
GetAway
d2896d02c2 menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7c9bf1df92
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 21:31:12 +01:00
GetAway
548eaef43f menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Origin commit data
------------------
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 13:25:47 +01:00
vanhofen
904003dede Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:41:46 +02:00
Jacek Jendrzej
041101db81 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 13:17:17 +02:00
vanhofen
a11d152062 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 07:10:33 +02:00
Thilo Graf
a15887cc4a CMenuWidget: don't use parameter for label width calculation 
Footer object does this itself.


Origin commit data
------------------
Commit: 35f048a735
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 12:35:59 +02:00
gixxpunk
c2a44aa4d8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
 2017-10-11 21:35:55 +02:00
Jacek Jendrzej
df4543b5e5 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2661fa4287
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)
 2017-10-08 18:03:01 +02:00
Thilo Graf
e650c02ba8 CMenuWidget: small clean ups 
Origin commit data
------------------
Commit: 4ad5ce65e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)
 2017-10-08 17:48:32 +02:00
Jacek Jendrzej
419a1fe9af Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 13:22:29 +02:00
Stefan Seyfried
c4e6ecdf63 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: ab3434e278
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 13:14:57 +02:00
Stefan Seyfried
57e71ff625 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: fea586b311
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 08:19:29 +02:00
vanhofen
b4363c5dc4 Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break"" 
This reverts the revert commit ab4decf40e.


Origin commit data
------------------
Commit: 39d31166c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 08:10:56 +02:00
Jacek Jendrzej
384b18ad8e Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 10:49:27 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 10:34:23 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 08:27:42 +02:00
Jacek Jendrzej
8d9241ff68 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 14:30:28 +02:00
vanhofen
5bbee58487 menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:29:51 +02:00
vanhofen
81b6ac9b3d menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: eb60c52a97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:26:22 +02:00
Jacek Jendrzej
894b1c146a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1fc8437a34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:56:03 +02:00
vanhofen
1dd887d5fc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 581d635af7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:53:23 +02:00
Jacek Jendrzej
ab4decf40e Revert "CMenuWidget: simplify menu_left_exit code, add missing break" 
This reverts commit a381903b02.


Origin commit data
------------------
Commit: 1deaebf1cf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:11:12 +02:00
Jacek Jendrzej
0b3c315cae Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 0abeb742bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 13:38:07 +02:00
vanhofen
e0c5fe6321 menue: fix coordinates for savescreen function 
Origin commit data
------------------
Commit: 96bb48b281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
 2017-09-26 13:36:33 +02:00
Jacek Jendrzej
3adca6f79c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: e4d0065909
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 13:02:04 +02:00
vanhofen
a856e0c40e menue: add missing delete 
Origin commit data
------------------
Commit: 77643f3b3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
 2017-09-26 13:00:49 +02:00
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:52:04 +02:00
vanhofen
cb235bd82c menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets 
* get bottom menu offset from CMenuSeparator()->getHeight()


Origin commit data
------------------
Commit: 33a596d175
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets

* get bottom menu offset from CMenuSeparator()->getHeight()
 2017-09-26 12:41:05 +02:00
Stefan Seyfried
a381903b02 CMenuWidget: simplify menu_left_exit code, add missing break 
Origin commit data
------------------
Commit: aa0863f0c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
Stefan Seyfried
d41f19b667 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
vanhofen
2f674ed6c0 menue: add missing delete 
Origin commit data
------------------
Commit: 8277f9f931
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
 2017-09-25 22:27:26 +02:00
vanhofen
0fafaec36d menue: fix coordinates for savescreen function 
Origin commit data
------------------
Commit: fd3a6a4ab0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
 2017-09-25 13:51:56 +02:00
Stefan Seyfried
1c4ac9a0e2 CMenuWidget: simplify menu_left_exit code, add missing break 
Origin commit data
------------------
Commit: 3ae33950eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:51 +02:00
Stefan Seyfried
0e185cdc08 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:50 +02:00
vanhofen
ee8b8fe002 menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets 
* get bottom menu offset from CMenuSeparator()->getHeight()


Origin commit data
------------------
Commit: 7071ae0852
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets

* get bottom menu offset from CMenuSeparator()->getHeight()
 2017-09-25 08:44:21 +02:00
Michael Liebmann
e137542efe Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
 2017-09-21 09:07:15 +02:00
vanhofen
402c567fe7 add and use FRAME_WIDTH defines; ... 
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-20 21:29:53 +02:00
vanhofen
619342d89d add and use FRAME_WIDTH defines; ... 
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines
 2017-09-20 13:46:31 +02:00
gixxpunk
2723dbdcba Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 18:37:22 +02:00
Jacek Jendrzej
c0f1dd3454 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ef0154a89b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 18:16:14 +02:00
vanhofen
955f1e2afa menue: use getItemColors() to get item colors 
Origin commit data
------------------
Commit: 57a17472a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
 2017-09-19 18:10:56 +02:00
Jacek Jendrzej
42c8775883 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 74be1f7b5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 16:24:38 +02:00
max_10
b780215fad mediaplayer: fixes form Duckbox git 
Origin commit data
------------------
Commit: af3a61cb96
Author: max_10 <max_10@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-19 15:12:53 +02:00
vanhofen
6ea00bb502 menue: use getItemColors() to get item colors 
Origin commit data
------------------
Commit: 477ece6ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
 2017-09-18 22:53:27 +02:00
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 16:31:55 +02:00
Jacek Jendrzej
c8b3cee9cb Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a23737a626
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 10:53:42 +02:00
Thilo Graf
3c2c889a58 CMenuItem: add members set/get info icon inside menu items 
Origin commit data
------------------
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
 2017-09-17 13:52:43 +02:00