Conflicts:
src/gui/osdlang_setup.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
------------------
This commit was generated by Migit
Conflicts:
src/gui/hdd_menu.cpp
src/gui/osdlang_setup.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 51bbb756e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1ca82ab44
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Origin message was:
------------------
- locals: remove unused stringinput.layout entry
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7fa3d737e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Origin message was:
------------------
- deutsch.locale: upgrade
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This controls more effective fontsize and button arrangement.
Lua API is not touched.
TODO: add more possible buttons. Color buttons for sure are not
be enough for some applications.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f96c2653b
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-02-16 (Mon, 16 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d4c6eedad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-17 (Tue, 17 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9d1854dd5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-17 (Tue, 17 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 051fb7c008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbf4c9bae8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8655264791
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d9e7a814d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 721cb9bd74
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a222fb5f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fcaeda6a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 930bd738f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: baf6bcdb97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 967f85eb5f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8658fb41a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
change paint_ca_icons to accept (const char *) to achieve this
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc99e757e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6a406deb4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30f3988583
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b90991da77
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b325268123
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e73d266c3e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a6d65937f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this removes the need for ugly (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fa68cae90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63d8c8e90b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a846cb1a97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-12 (Thu, 12 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 51b15fbc1d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30671b5767
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b34e50f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce5084ea52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1572e2f32c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
change paint_ca_icons to accept (const char *) to achieve this
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5892011862
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03932f2b04
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8004564022
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50cdc64dc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8503bf3bc7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fad56623f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 370e9d9e27
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this removes the need for ugly (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 086c720806
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8066b5a3e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This reverts commit 9423a68853.
...to allow a clean merge...
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7043d230f6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
This reverts commit 8d073853d2.
... to allow a clean merget...
Origin commit data
------------------
Branch: ni/coolstream
Commit: a46d366450
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
This reverts commit d55b0c3bf9.
...to allow a clean merge...
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8a5ce2cc4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
- breaks user-space fs like exfat
This reverts commit bb5fbb9954.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d287e46f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit
- broken in case readlink do not support -f switch -> filesystem always 'mounted'
This reverts commit 47f2cfd410.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 990e79aa6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)
------------------
This commit was generated by Migit