[CST] Focus 8b4daf875c fix conflicts ...

Origin commit data
------------------
Branch: ni/coolstream
Commit: d39b174c75
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

2012-03-20 11:07:28 +04:00

..

configure_network.cpp

neutrino: add missing includes to fix compile with gcc-4.5.2

2011-03-18 18:54:28 +00:00

configure_network.h

Testing changes to support wireless network adapters configuration.

2011-03-16 12:57:09 +00:00

debug.cpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

debug.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

flashtool.cpp

fix Wextra compil

2010-09-14 17:13:29 +00:00

flashtool.h

comma at end of enumerator list

2010-09-14 17:21:25 +00:00

fsmounter.cpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

fsmounter.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

httptool.cpp

Set connect timeout to 10 seconds, search for updates takes too long in case host not answer

2011-11-25 08:55:33 +00:00

httptool.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

lastchannel.cpp

Fix strict compile

2011-11-22 10:09:51 +00:00

lastchannel.h

Experimental: save/restore channel list mode for history zaps

2011-11-22 09:49:51 +00:00

localize.cpp

system/localize.cpp: remove old code; dont load default locale twice

2012-03-08 15:00:20 +00:00

localize.h

osd fix, tab for screening

2010-10-13 14:47:27 +00:00

locals_intern.h

Merge branch 'master' into multituner

2012-03-02 18:59:50 +04:00

locals.h

Merge branch 'master' into multituner

2012-03-02 18:59:50 +04:00

Makefile.am

add "libtriple" skeleton

2010-12-25 17:43:09 +00:00

ping-config.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

ping-linux.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

ping.c

memcpy -> memmove

2011-03-09 12:55:31 +00:00

ping.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

setting_helpers.cpp

fix conflicts

2012-03-20 11:07:28 +04:00

setting_helpers.h

setting_helpers: cleanup unused code

2012-01-13 14:49:04 +04:00

settings.cpp

Merge branch 'master' into multituner

2012-02-19 12:25:28 +04:00

settings.h

Merge branch 'master' into multituner

2012-02-19 12:25:28 +04:00

timer.cpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

timer.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00