mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
083bc55347
needs some build-fixing and merge errors are likely :-(
Conflicts:
configure.ac
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/unmaintained/dutch.locale
lib/libdvbsub/Makefile.am
lib/libdvbsub/dvbsubtitle.cpp
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/daemonc/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/framebuffer.h
src/driver/pictureviewer/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/driver/volume.cpp
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/audioplayer.cpp
src/gui/bedit/Makefile.am
src/gui/bedit/bouqueteditor_chanselect.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/components/Makefile.am
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/keybind_setup.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/test_menu.cpp
src/gui/test_menu.h
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/Makefile.am
src/gui/widget/buttons.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
src/system/setting_helpers.cpp
src/system/settings.h
src/zapit/include/zapit/client/zapitclient.h
src/zapit/include/zapit/femanager.h
src/zapit/include/zapit/getservices.h
src/zapit/lib/zapitclient.cpp
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
------------------
This commit was generated by Migit
43 lines
500 B
Plaintext
43 lines
500 B
Plaintext
### mostly autoconf crap
|
|
Makefile
|
|
autom4te.cache
|
|
*.in
|
|
aclocal.m4
|
|
config.*
|
|
configure
|
|
depcomp
|
|
install-sh
|
|
*.pc
|
|
libtool
|
|
ltmain.sh
|
|
missing
|
|
stamp-h1
|
|
README
|
|
COPYING
|
|
INSTALL
|
|
|
|
### objects and libs
|
|
.libs
|
|
.deps
|
|
*.o
|
|
*.so
|
|
*.lo
|
|
*.a
|
|
*.la
|
|
.*.swp
|
|
|
|
### editor crap
|
|
*.rej
|
|
*~
|
|
|
|
### binaries that fall out of the build
|
|
lib/sectionsdclient/sectionsdcontrol
|
|
src/neutrino
|
|
src/nhttpd/web/*.js.gz
|
|
src/zapit/src/pzapit
|
|
src/zapit/src/udpstreampes
|
|
src/drivertool
|
|
src/gui/svn_version.h
|
|
src/gui/git_version.h
|
|
src/nhttpd/nhttpd.conf
|