Files
recycled-ni-neutrino/.gitignore
Stefan Seyfried 8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00

46 lines
519 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/rcsim.h
src/rcsim
src/gui/version.h
src/nhttpd/nhttpd.conf
src/mdev_helper