[vdr-plugin-tvguide] 02/03: Merge tag 'upstream/1.2.2'
Tobias Grimm
tiber-guest at moszumanska.debian.org
Tue Feb 10 18:11:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-tvguide.
commit 023ca26e2517f354478079edca52eae08e1c468e
Merge: ffa2697 ca346bb
Author: etobi <git at e-tobi.net>
Date: Tue Feb 10 19:08:41 2015 +0100
Merge tag 'upstream/1.2.2'
Upstream version 1.2.2
HISTORY | 128 +
Makefile | 25 +-
Makefile-smaller-VDR1.7.34 | 115 -
README | 281 +-
channelcolumn.c | 558 ++--
channelcolumn.h | 82 +-
channelgroup.c | 98 +
channelgroup.h | 44 +
channelgroups.c | 143 +
channelgroups.h | 30 +
channeljump.c | 90 +
channeljump.h | 29 +
config.c | 472 ++--
config.h | 308 ++-
detailview.c | 315 +--
detailview.h | 49 +-
dummygrid.c | 111 +
dummygrid.h | 34 +
epggrid.c | 255 +-
epggrid.h | 56 +-
fontmanager.c | 96 +
fontmanager.h | 41 +
footer.c | 174 +-
footer.h | 32 +-
geometrymanager.c | 74 +
geometrymanager.h | 54 +
grid.c | 82 +
grid.h | 58 +
headergrid.c | 128 +
headergrid.h | 21 +
icons/darkredNG/osdElements/button_30percent.png | Bin 0 -> 39062 bytes
icons/darkredNG/osdElements/button_70percent.png | Bin 0 -> 103047 bytes
.../osdElements/button_active_30percent.png | Bin 0 -> 38329 bytes
.../osdElements/button_active_70percent.png | Bin 0 -> 99939 bytes
icons/darkredNG/osdElements/buttonblue.png | Bin 0 -> 12519 bytes
icons/darkredNG/osdElements/buttongreen.png | Bin 0 -> 12737 bytes
icons/darkredNG/osdElements/buttonred.png | Bin 0 -> 12362 bytes
icons/darkredNG/osdElements/buttonyellow.png | Bin 0 -> 13023 bytes
icons/darkredNG/osdElements/channel_jump.png | Bin 0 -> 76404 bytes
.../darkredNG/osdElements/channelgroup_bottom.png | Bin 0 -> 2292 bytes
icons/darkredNG/osdElements/channelgroup_head.png | Bin 0 -> 2288 bytes
.../osdElements/channelgroup_horizontal.png | Bin 0 -> 31050 bytes
icons/darkredNG/osdElements/channelgroup_left.png | Bin 0 -> 1998 bytes
icons/darkredNG/osdElements/channelgroup_right.png | Bin 0 -> 1861 bytes
.../osdElements/channelgroup_vertical.png | Bin 0 -> 14472 bytes
.../osdElements/channellogoback_horizontal.png | Bin 0 -> 16307 bytes
.../osdElements/channellogoback_vertical.png | Bin 0 -> 26057 bytes
icons/darkredNG/osdElements/clock.png | Bin 0 -> 5976 bytes
icons/darkredNG/osdElements/date_vertical.png | Bin 0 -> 19803 bytes
icons/darkredNG/osdElements/grid_active_bottom.png | Bin 0 -> 2642 bytes
icons/darkredNG/osdElements/grid_active_head.png | Bin 0 -> 2684 bytes
.../osdElements/grid_active_horizontal.png | Bin 0 -> 30601 bytes
icons/darkredNG/osdElements/grid_active_left.png | Bin 0 -> 2328 bytes
icons/darkredNG/osdElements/grid_active_right.png | Bin 0 -> 2208 bytes
.../darkredNG/osdElements/grid_active_vertical.png | Bin 0 -> 97490 bytes
icons/darkredNG/osdElements/grid_bottom.png | Bin 0 -> 4170 bytes
icons/darkredNG/osdElements/grid_head.png | Bin 0 -> 3852 bytes
icons/darkredNG/osdElements/grid_horizontal.png | Bin 0 -> 32326 bytes
icons/darkredNG/osdElements/grid_left.png | Bin 0 -> 2301 bytes
icons/darkredNG/osdElements/grid_right.png | Bin 0 -> 2182 bytes
icons/darkredNG/osdElements/grid_vertical.png | Bin 0 -> 98957 bytes
icons/darkredNG/osdElements/recmenu_background.png | Bin 0 -> 309224 bytes
.../osdElements/statusheader_content_full.png | Bin 0 -> 259761 bytes
.../osdElements/statusheader_content_windowed.png | Bin 0 -> 195867 bytes
.../darkredNG/osdElements/statusheader_tvframe.png | Bin 0 -> 57079 bytes
.../darkredNG/osdElements/timeline1_horizontal.png | Bin 0 -> 21401 bytes
icons/darkredNG/osdElements/timeline1_vertical.png | Bin 0 -> 17751 bytes
.../darkredNG/osdElements/timeline2_horizontal.png | Bin 0 -> 20310 bytes
icons/darkredNG/osdElements/timeline2_vertical.png | Bin 0 -> 17650 bytes
icons/darkredNG/recmenuicons/activetimer.png | Bin 0 -> 1731 bytes
icons/darkredNG/recmenuicons/arrow_left.png | Bin 0 -> 1136 bytes
icons/darkredNG/recmenuicons/arrow_right.png | Bin 0 -> 936 bytes
icons/darkredNG/recmenuicons/delete_active.png | Bin 0 -> 768 bytes
icons/darkredNG/recmenuicons/delete_inactive.png | Bin 0 -> 886 bytes
icons/darkredNG/recmenuicons/edit_active.png | Bin 0 -> 2599 bytes
icons/darkredNG/recmenuicons/edit_inactive.png | Bin 0 -> 2009 bytes
icons/darkredNG/recmenuicons/icon_backspace.png | Bin 0 -> 1873 bytes
icons/darkredNG/recmenuicons/icon_del_ins.png | Bin 0 -> 1532 bytes
icons/darkredNG/recmenuicons/icon_shift.png | Bin 0 -> 1274 bytes
icons/darkredNG/recmenuicons/info_active.png | Bin 0 -> 2421 bytes
icons/darkredNG/recmenuicons/info_inactive.png | Bin 0 -> 1859 bytes
icons/darkredNG/recmenuicons/no.png | Bin 0 -> 1627 bytes
icons/darkredNG/recmenuicons/record_active.png | Bin 0 -> 6736 bytes
icons/darkredNG/recmenuicons/record_inactive.png | Bin 0 -> 3859 bytes
icons/darkredNG/recmenuicons/search_active.png | Bin 0 -> 3426 bytes
icons/darkredNG/recmenuicons/search_inactive.png | Bin 0 -> 2977 bytes
icons/darkredNG/recmenuicons/yes.png | Bin 0 -> 2655 bytes
icons/default/osdElements/button_30percent.png | Bin 0 -> 38442 bytes
icons/default/osdElements/button_70percent.png | Bin 0 -> 105355 bytes
.../osdElements/button_active_30percent.png | Bin 0 -> 39767 bytes
.../osdElements/button_active_70percent.png | Bin 0 -> 105357 bytes
icons/default/osdElements/buttonblue.png | Bin 0 -> 12519 bytes
icons/default/osdElements/buttongreen.png | Bin 0 -> 12737 bytes
icons/default/osdElements/buttonred.png | Bin 0 -> 12362 bytes
icons/default/osdElements/buttonyellow.png | Bin 0 -> 13023 bytes
icons/default/osdElements/channel_jump.png | Bin 0 -> 87769 bytes
icons/default/osdElements/channelgroup_bottom.png | Bin 0 -> 1877 bytes
icons/default/osdElements/channelgroup_head.png | Bin 0 -> 1836 bytes
.../osdElements/channelgroup_horiziontal.png | Bin 0 -> 31893 bytes
.../osdElements/channelgroup_horizontal.png | Bin 0 -> 31893 bytes
icons/default/osdElements/channelgroup_left.png | Bin 0 -> 1942 bytes
icons/default/osdElements/channelgroup_right.png | Bin 0 -> 1789 bytes
.../default/osdElements/channelgroup_vertical.png | Bin 0 -> 16921 bytes
.../default/osdElements/channelgroups_vertical.png | Bin 0 -> 19041 bytes
.../osdElements/channellogoback_horizontal.png | Bin 0 -> 17836 bytes
.../osdElements/channellogoback_vertical.png | Bin 0 -> 28204 bytes
icons/default/osdElements/clock.png | Bin 0 -> 6001 bytes
icons/default/osdElements/date_vertical.png | Bin 0 -> 19803 bytes
icons/default/osdElements/grid_active_bottom.png | Bin 0 -> 3289 bytes
icons/default/osdElements/grid_active_head.png | Bin 0 -> 3424 bytes
.../default/osdElements/grid_active_horizontal.png | Bin 0 -> 33656 bytes
icons/default/osdElements/grid_active_left.png | Bin 0 -> 2524 bytes
icons/default/osdElements/grid_active_right.png | Bin 0 -> 2527 bytes
icons/default/osdElements/grid_active_vertical.png | Bin 0 -> 100607 bytes
icons/default/osdElements/grid_bottom.png | Bin 0 -> 2863 bytes
icons/default/osdElements/grid_head.png | Bin 0 -> 2800 bytes
icons/default/osdElements/grid_horizontal.png | Bin 0 -> 33304 bytes
icons/default/osdElements/grid_left.png | Bin 0 -> 2462 bytes
icons/default/osdElements/grid_right.png | Bin 0 -> 2389 bytes
icons/default/osdElements/grid_vertical.png | Bin 0 -> 100766 bytes
icons/default/osdElements/grids_vertical.png | Bin 0 -> 116790 bytes
icons/default/osdElements/recmenu_background.png | Bin 0 -> 305292 bytes
.../osdElements/statusheader_content_full.png | Bin 0 -> 262937 bytes
.../osdElements/statusheader_content_windowed.png | Bin 0 -> 212247 bytes
icons/default/osdElements/statusheader_tvframe.png | Bin 0 -> 57459 bytes
icons/default/osdElements/timeline1_horizontal.png | Bin 0 -> 21401 bytes
icons/default/osdElements/timeline1_vertical.png | Bin 0 -> 17751 bytes
icons/default/osdElements/timeline2_horizontal.png | Bin 0 -> 20310 bytes
icons/default/osdElements/timeline2_vertical.png | Bin 0 -> 17650 bytes
icons/default/recmenuicons/activetimer.png | Bin 0 -> 1731 bytes
icons/default/recmenuicons/arrow_left.png | Bin 0 -> 1136 bytes
icons/default/recmenuicons/arrow_right.png | Bin 0 -> 936 bytes
icons/default/recmenuicons/delete_active.png | Bin 0 -> 768 bytes
icons/default/recmenuicons/delete_inactive.png | Bin 0 -> 886 bytes
icons/default/recmenuicons/edit_active.png | Bin 0 -> 2599 bytes
icons/default/recmenuicons/edit_inactive.png | Bin 0 -> 2009 bytes
icons/default/recmenuicons/icon_backspace.png | Bin 0 -> 1873 bytes
icons/default/recmenuicons/icon_del_ins.png | Bin 0 -> 1532 bytes
icons/default/recmenuicons/icon_shift.png | Bin 0 -> 1274 bytes
icons/default/recmenuicons/info_active.png | Bin 0 -> 2421 bytes
icons/default/recmenuicons/info_inactive.png | Bin 0 -> 1859 bytes
icons/default/recmenuicons/no.png | Bin 0 -> 1627 bytes
icons/default/recmenuicons/record_active.png | Bin 0 -> 6736 bytes
icons/default/recmenuicons/record_inactive.png | Bin 0 -> 3859 bytes
icons/default/recmenuicons/search_active.png | Bin 0 -> 3426 bytes
icons/default/recmenuicons/search_inactive.png | Bin 0 -> 2977 bytes
icons/default/recmenuicons/yes.png | Bin 0 -> 2655 bytes
icons/recmenuicons/activetimer.png | Bin 0 -> 1731 bytes
icons/recmenuicons/arrow_left.png | Bin 0 -> 1136 bytes
icons/recmenuicons/arrow_right.png | Bin 0 -> 936 bytes
icons/recmenuicons/delete_active.png | Bin 0 -> 768 bytes
icons/recmenuicons/delete_inactive.png | Bin 0 -> 886 bytes
icons/recmenuicons/edit_active.png | Bin 0 -> 2599 bytes
icons/recmenuicons/edit_inactive.png | Bin 0 -> 2009 bytes
icons/recmenuicons/icon_backspace.png | Bin 0 -> 1873 bytes
icons/recmenuicons/icon_del_ins.png | Bin 0 -> 1532 bytes
icons/recmenuicons/icon_shift.png | Bin 0 -> 1274 bytes
icons/recmenuicons/info_active.png | Bin 0 -> 2421 bytes
icons/recmenuicons/info_inactive.png | Bin 0 -> 1859 bytes
icons/recmenuicons/no.png | Bin 0 -> 1627 bytes
icons/recmenuicons/record_active.png | Bin 0 -> 6736 bytes
icons/recmenuicons/record_inactive.png | Bin 0 -> 3859 bytes
icons/recmenuicons/search_active.png | Bin 0 -> 3426 bytes
icons/recmenuicons/search_inactive.png | Bin 0 -> 2977 bytes
icons/recmenuicons/yes.png | Bin 0 -> 2655 bytes
imagecache.c | 715 +++++
imagecache.h | 92 +
imageloader.c | 179 +-
imageloader.h | 16 +-
imagemagickwrapper.c | 162 ++
imagemagickwrapper.h | 27 +
imagescaler.c | 149 +
imagescaler.h | 97 +
messagebox.c | 114 -
messagebox.h | 31 -
osdmanager.c | 68 +-
osdmanager.h | 23 +
po/ca_ES.po | 958 +++++++
po/de_DE.po | 882 +++++-
po/ru_RU.po | 955 +++++++
po/sk_SK.po | 955 +++++++
recmanager.c | 714 +++++
recmanager.h | 63 +
recmenu.c | 695 +++++
recmenu.h | 66 +
recmenuitem.c | 2902 ++++++++++++++++++++
recmenuitem.h | 684 +++++
recmenumanager.c | 893 ++++++
recmenumanager.h | 42 +
recmenus.c | 1561 +++++++++++
recmenus.h | 485 ++++
searchtimer.c | 570 ++++
searchtimer.h | 136 +
services/epgsearch.h | 202 ++
services/remotetimers.h | 33 +
services/scraper2vdr.h | 194 ++
setup.c | 561 +++-
setup.h | 100 +-
statusheader.c | 142 +
statusheader.h | 25 +
styledpixmap.c | 233 +-
styledpixmap.h | 70 +-
switchtimer.c | 113 +
switchtimer.h | 31 +
themes/tvguide-blue.theme | 53 +
themes/tvguide-darkblue.theme | 28 +-
themes/tvguide-darkred.theme | 53 +
themes/tvguide-darkredNG.theme | 53 +
themes/tvguide-default.theme | 65 +-
themes/tvguide-green.theme | 53 +
themes/tvguide-iceblue.theme | 51 +
themes/tvguide-keepitsimple.theme | 49 +
themes/tvguide-nOpacity.theme | 28 -
themes/tvguide-nOpacitygreen.theme | 28 -
timeline.c | 334 ++-
timeline.h | 29 +-
timer.c | 200 +-
timer.h | 66 +-
timerconflict.c | 177 ++
timerconflict.h | 38 +
tools.c | 474 ++++
tools.h | 68 +
tvguide.c | 156 +-
tvguideosd.c | 1171 ++++----
tvguideosd.h | 48 +-
view.c | 1046 +++++++
view.h | 149 +
227 files changed, 21820 insertions(+), 2518 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-tvguide.git
More information about the pkg-vdr-dvb-changes
mailing list