mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/settings_manager.cpp
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Commit: 483f4053a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)
Origin message was:
------------------
- settings_manager: remember last used directory
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/settings_manager.cpp
Signed-off-by: Thilo Graf <dbt@novatux.de>