mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
81ca577fb811a476a2d28e88404f6cdcb2b15569
Conflicts: src/driver/pictureviewer/pictureviewer.cpp src/gui/components/cc_item_picture.cpp src/gui/movieplayer.cpp src/gui/osdlang_setup.cpp src/neutrino.cpp src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp src/nhttpd/yhttpd.cpp src/system/helpers.h src/system/setting_helpers.cpp
The file is empty.
Description
Languages
C++
85.3%
C
12.3%
M4
0.6%
Makefile
0.6%
JavaScript
0.4%
Other
0.7%