Files
recycled-ni-neutrino/.gitignore
Stefan Seyfried 2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00

43 lines
481 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/dt
src/gui/version.h
src/nhttpd/nhttpd.conf