mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
af8fe3ebc6
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/Makefile.am
data/locale/deutsch.locale
data/locale/english.locale
lib/libdvbsub/dvbsub.cpp
lib/libdvbsub/dvbsubtitle.cpp
lib/libtuxtxt/tuxtxt.cpp
lib/libtuxtxt/tuxtxt.h
src/gui/dboxinfo.cpp
src/gui/movieplayer.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/Makefile.am
src/system/flashtool.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
------------------
This commit was generated by Migit
55 lines
620 B
Plaintext
55 lines
620 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
|
|
#*.orig
|
|
#*.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
|
|
local_build_config.h
|
|
|
|
### system generated stuff
|
|
# dolphin
|
|
.directory
|
|
# kate
|
|
*-swp
|
|
compile
|