mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/moviebrowser.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: 7fac02ba45
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)