[vdr-plugin-live] 03/08: Merge tag 'upstream/0.3.0'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-live.

commit 170f3d45efd9db5f8a46c956fe40aba733e5022f
Merge: c7edc0e 07f8e8b
Author: etobi <git at e-tobi.net>
Date:   Wed Oct 29 21:44:28 2014 +0100

    Merge tag 'upstream/0.3.0'
    
    Upstream version 0.3.0

 .cvsignore                                        |   7 -
 .gitignore                                        |  14 --
 HISTORY                                           |   9 ++
 Makefile                                          |   9 +-
 README                                            |   8 +-
 css/Makefile                                      |   3 +
 doc/ChangeLog                                     |   5 +
 doc/TODO.txt                                      |   3 -
 doc/web/homepage/de/download.php                  |  79 -----------
 doc/web/homepage/de/features_0-1-0.inc            |   3 -
 doc/web/homepage/de/features_0-2-0.inc            | 111 ---------------
 doc/web/homepage/de/img/editsearchtimer.jpg       | Bin 93409 -> 0 bytes
 doc/web/homepage/de/img/editsearchtimer_thumb.jpg | Bin 12985 -> 0 bytes
 doc/web/homepage/de/img/edittimer.jpg             | Bin 74716 -> 0 bytes
 doc/web/homepage/de/img/edittimer_thumb.jpg       | Bin 10683 -> 0 bytes
 doc/web/homepage/de/img/favourites.jpg            | Bin 127139 -> 0 bytes
 doc/web/homepage/de/img/favourites_thumb.jpg      | Bin 17801 -> 0 bytes
 doc/web/homepage/de/img/recordings.jpg            | Bin 144417 -> 0 bytes
 doc/web/homepage/de/img/recordings_thumb.jpg      | Bin 17490 -> 0 bytes
 doc/web/homepage/de/img/remote.jpg                | Bin 77753 -> 0 bytes
 doc/web/homepage/de/img/remote_thumb.jpg          | Bin 10877 -> 0 bytes
 doc/web/homepage/de/img/schedule.jpg              | Bin 107086 -> 0 bytes
 doc/web/homepage/de/img/schedule_thumb.jpg        | Bin 14350 -> 0 bytes
 doc/web/homepage/de/img/search.jpg                | Bin 69939 -> 0 bytes
 doc/web/homepage/de/img/search_thumb.jpg          | Bin 10599 -> 0 bytes
 doc/web/homepage/de/img/searchtimer.jpg           | Bin 101537 -> 0 bytes
 doc/web/homepage/de/img/searchtimer_thumb.jpg     | Bin 13954 -> 0 bytes
 doc/web/homepage/de/img/setup.jpg                 | Bin 86243 -> 0 bytes
 doc/web/homepage/de/img/setup_thumb.jpg           | Bin 13079 -> 0 bytes
 doc/web/homepage/de/img/timerconflict.jpg         | Bin 61515 -> 0 bytes
 doc/web/homepage/de/img/timerconflict_thumb.jpg   | Bin 8480 -> 0 bytes
 doc/web/homepage/de/img/whatson.jpg               | Bin 178868 -> 0 bytes
 doc/web/homepage/de/img/whatson_thumb.jpg         | Bin 19780 -> 0 bytes
 doc/web/homepage/de/img/whatsonlist.jpg           | Bin 152162 -> 0 bytes
 doc/web/homepage/de/img/whatsonlist_thumb.jpg     | Bin 19561 -> 0 bytes
 doc/web/homepage/de/index.php                     | 146 --------------------
 doc/web/homepage/de/install_0-1-0.inc             |  40 ------
 doc/web/homepage/de/install_0-2-0.inc             |  49 -------
 doc/web/homepage/de/install_devel.inc             |  49 -------
 doc/web/homepage/de/news.php                      |  37 -----
 doc/web/homepage/de/screenshots.php               |  46 -------
 doc/web/homepage/de/settings-de.inc               |  28 ----
 doc/web/homepage/en/download.php                  |  81 -----------
 doc/web/homepage/en/features_0-1-0.inc            |   3 -
 doc/web/homepage/en/features_0-2-0.inc            |  98 --------------
 doc/web/homepage/en/img                           |   1 -
 doc/web/homepage/en/index.php                     | 144 --------------------
 doc/web/homepage/en/install_0-1-0.inc             |  38 ------
 doc/web/homepage/en/install_0-2-0.inc             |  49 -------
 doc/web/homepage/en/install_devel.inc             |  49 -------
 doc/web/homepage/en/news.php                      |  37 -----
 doc/web/homepage/en/screenshots.php               |  46 -------
 doc/web/homepage/en/settings-en.inc               |  28 ----
 doc/web/homepage/html-header.inc                  |  31 -----
 doc/web/homepage/img                              |   1 -
 doc/web/homepage/index.php                        |   7 -
 doc/web/homepage/live-sw-configs.php              |  50 -------
 doc/web/homepage/page-header.inc                  |  20 ---
 doc/web/homepage/page-menu.inc                    |  13 --
 doc/web/homepage/page-php-classes.inc             | 158 ----------------------
 doc/web/homepage/styles.css                       |   1 -
 epgsearch.cpp                                     |  58 ++++----
 epgsearch.h                                       |  14 +-
 httpd/.cvsignore                                  |   1 -
 httpd/Makefile                                    |   5 +-
 javascript/Makefile                               |   3 +
 livefeatures.h                                    |   2 +-
 pages/.cvsignore                                  |   2 -
 pages/Makefile                                    |   6 +-
 pages/pageelems.ecpp                              |   2 +-
 pages/recordings.ecpp                             |  17 ++-
 pages/setup.ecpp                                  |   4 +
 po/.cvsignore                                     |   3 -
 po/de_DE.po                                       |   1 -
 setup.cpp                                         |  13 +-
 setup.h                                           |   4 +-
 tntfeatures.h                                     |   2 +
 77 files changed, 103 insertions(+), 1535 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-live.git