Fix merge conflict
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fe7504007
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f94afc1593
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
