mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Conflicts:
src/gui/components/cc_frm.h
src/gui/components/cc_frm_icons.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b386f7bbd2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
------------------
This commit was generated by Migit