Commit Graph

10579 Commits

Author SHA1 Message Date
Michael Liebmann
352b7f75f8 CStreamInfo2: Add new info items
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
2cb6e23686 CFbAccelCSHD[1|2]::setMode(): Insert cVideo::updateOsdScreenInfo()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40a4ec4262
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:56 +02:00
Michael Liebmann
55713c92e3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e00bc5b4c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 21:54:01 +02:00
vanhofen
99b8e43a28 jsoncpp: update to current version 1.8.0
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b945336a79
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0

Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 21:23:10 +02:00
vanhofen
d1bc7c4e6a Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am"
This reverts commit fa69b2e2ba, because
some people has build-problems.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 78e519f694
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 21:10:27 +02:00
vanhofen
fa69b2e2ba jsoncpp: update to current version 1.8.0; align Makefile.am
Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 760a64fc6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0; align Makefile.am

Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 11:22:41 +02:00
vanhofen
942ae2b689 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dfd4184ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-27 18:15:27 +02:00
vanhofen
d5d3ffec8e upnpbrowser: fix neutrino mode while playing audio
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81078780db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)

Origin message was:
------------------
- upnpbrowser: fix neutrino mode while playing audio

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

------------------
This commit was generated by Migit
2017-03-27 08:11:49 +02:00
vanhofen
bd1b3c210a upnpbrowser: reduce console output in updateTimes()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 324359d31d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)

Origin message was:
------------------
- upnpbrowser: reduce console output in updateTimes()

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

------------------
This commit was generated by Migit
2017-03-27 08:11:49 +02:00
vanhofen
dc17e7f450 upnpbrowser: reduce console output in selectDevice()
Origin commit data
------------------
Branch: ni/coolstream
Commit: f10ecb6667
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- upnpbrowser: reduce console output in selectDevice()

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

------------------
This commit was generated by Migit
2017-03-26 23:31:08 +02:00
Michael Liebmann
c2d87de865 CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined
Origin commit data
------------------
Branch: ni/coolstream
Commit: 515ab1fe59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
Michael Liebmann
968e1ce9c0 src/neutrino.cpp: Simplification EVT_AUTO_SET_VIDEOSYSTEM handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea18657562
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
Michael Liebmann
1eb46311d5 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9ce33a69a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 18:58:48 +01:00
Jacek Jendrzej
69fb6175d4 fix needed mem check
Origin commit data
------------------
Branch: ni/coolstream
Commit: 833a65c9e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 12:43:27 +01:00
vanhofen
56ccefe22a cables.xml: update WTC SN; thanks to Gorcon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 608c092685
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- cables.xml: update WTC SN; thanks to Gorcon

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

------------------
This commit was generated by Migit
2017-03-23 12:23:56 +01:00
vanhofen
8ddf5d35ce acinclude.m4: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c0d135a1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
- acinclude.m4: fix merge error

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

------------------
This commit was generated by Migit
2017-03-22 15:32:58 +01:00
Michael Liebmann
79b679a9ca Fix videosystem auto mode / osd mode switch in movie player
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a858c628a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 14:00:41 +01:00
vanhofen
4ce21cbc1d Merge branch 'master' into pu/mp
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: b1ba85c8c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 12:16:01 +01:00
vanhofen
e2401e81d1 acinclude.m4: remove more old unused cruft
I don't know if CC/CXX-handling is right, but powerpc-tuxbox-linux-gnu
was definitely wrong.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e3920273bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
- acinclude.m4: remove more old unused cruft

I don't know if CC/CXX-handling is right, but powerpc-tuxbox-linux-gnu
was definitely wrong.


------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
vanhofen
e7fc4f07e2 acinclude.m4: align to neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ff55dd47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
- acinclude.m4: align to neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
Stefan Seyfried
949306bfed acinclude: remove old unused cruft
remove:
- unused boxtypes, these only give a false sense of support
- unused configure options and associated #defines in config.h
- unused confiugre check macros


Origin commit data
------------------
Branch: ni/coolstream
Commit: 216a774343
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
Michael Liebmann
bb863722f2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cac85205b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 01:24:03 +01:00
Michael Liebmann
089f59cc26 hd[1|2]/libcoolstream: Update headers for new libcoolstream functions
libcoolstream-mt.so version 3.2.0 required

 Functions:
 - updateOsdScreenInfo()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - fbCopy()
 - fbFill()
 - cs_set_extra_debug()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bc2d9b95e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
hd[1|2]/libcoolstream: Update headers for new libcoolstream functions

 libcoolstream-mt.so version 3.2.0 required

 Functions:
  - updateOsdScreenInfo()
  - GetVideoSystem()
  - GetVideoSystemFormatName()
  - fbCopy()
  - fbFill()
  - cs_set_extra_debug()


------------------
This commit was generated by Migit
2017-03-22 01:23:45 +01:00
vanhofen
ba30b3009a neutrino: grab whole ExitRun() from neutrino-mp ...
This fixes my last merge commit, small typos and alignes indentation.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d2f02371e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)

Origin message was:
------------------
- neutrino: grab whole ExitRun() from neutrino-mp ...

This fixes my last merge commit, small typos and alignes indentation.


------------------
This commit was generated by Migit
2017-03-21 10:29:35 +01:00
vanhofen
7ba5e5e16e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1373662e31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-21 10:19:07 +01:00
Michael Liebmann
5b871d8901 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8212746cf1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 23:11:33 +01:00
Thilo Graf
037ad21618 CComponentsButton: simplify assignment of button message values
Count of alternate message values was limited to 1 value. Now it is
possible to add any count of message values.

directKey and directKeyAlt were removed from struct type 'button_label_cc'
and directKeys was added as container for possible message values.

Some methods of CComponentsFooter had to be adapted for that.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb6a315fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit
2017-03-20 22:55:05 +01:00
Jacek Jendrzej
3f6c2e83a2 fix segfault aufter unbreak msgbox 56ddedaa39
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8516b1662d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 17:40:26 +01:00
vanhofen
cb3b233e6c move movieinfo.cpp|h from src/gui to src/driver ...
because there are no gui-elements included anymore


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b629aafc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)

Origin message was:
------------------
- move movieinfo.cpp|h from src/gui to src/driver ...

because there are no gui-elements included anymore


------------------
This commit was generated by Migit
2017-03-20 14:30:44 +01:00
vanhofen
d404deb1d2 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: b12624d1fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit
2017-03-20 01:31:51 +01:00
Michael Liebmann
ae9fdb3dd1 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73f2aa87d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:40:31 +01:00
Michael Liebmann
8ebfd5d23f CNeutrinoApp::InitMenuMain: Fix compiler warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b3a8da68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:40:10 +01:00
Michael Liebmann
bbf628bf89 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: be49686432
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:00:35 +01:00
vanhofen
304b71b6dc neutrino: just code cosmetics in ExitRun()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8a97a97ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: just code cosmetics in ExitRun()

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
f24af0df57 neutrino: remove unused write_si from ExitRun() function ...
and rename retcode to can_shutdown for a better readability


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec6e863e6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: remove unused write_si from ExitRun() function ...

and rename retcode to can_shutdown for a better readability


------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
514707f0c8 use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1ee8b73a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
02c9a3dec4 move src/timerd/doku.html to doc/timerd.html
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb8f8bef8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- move src/timerd/doku.html to doc/timerd.html

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
Thilo Graf
69cc4d7a74 CProgressWindow: try to reduce effort inside progress display
Should help to reduce some timing side effects with many data amounts.
But there could still be more potential.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2de98df48f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CProgressWindow: try to reduce effort inside progress display

Should help to reduce some timing side effects with many data amounts.
But there could still be more potential.


------------------
This commit was generated by Migit
2017-03-19 22:37:32 +01:00
Thilo Graf
8d67cc08b7 CNeutrinoFonts: reduce debug spam
In some cases with many following dynamic size changes,
it could be better to suppress this output.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96e05c69dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CNeutrinoFonts: reduce debug spam

In some cases with many following dynamic size changes,
it could be better to suppress this output.


------------------
This commit was generated by Migit
2017-03-19 22:32:15 +01:00
Thilo Graf
c40ccb5ff3 CColorChooser: fix missing rewrite current values to *value[selected]
Supplement to commit:
	CColorChooser: fix compile conversion warnings
	054d0c33bf


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9801c3100c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CColorChooser: fix missing rewrite current values to *value[selected]

Supplement to commit:
	CColorChooser: fix compile conversion warnings
	054d0c33bf


------------------
This commit was generated by Migit
2017-03-19 16:06:04 +01:00
Michael Liebmann
0afee77c57 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-19 08:38:15 +01:00
vanhofen
49102e314a remove unused g_info.delivery_system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 720269c99a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.delivery_system

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
0385dbc30c remove unused g_info.box_Type
Origin commit data
------------------
Branch: ni/coolstream
Commit: 233886df8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.box_Type

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
9d2ce8caf1 use g_info.hw_caps->has_fan; remove old g_info.has_fan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
dbc883b43b neutrinoyparser: remove workaround for Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
d756900191 controlapi: use "CST" instead of "Coolstream" ...
because I don't know the current legal situation.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.


------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
2770d07bea hardware_caps: fix has_fan and add detection of Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
Jacek Jendrzej
f3b014b867 src/driver/fb_generic.cpp fix possible memleak and possible double free
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66ea57d710
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-17 15:04:11 +01:00
Michael Liebmann
a14300eca2 Merge branch 'master' into pu/fb-setmode
Conflicts:
 src/driver/screenshot.h
 src/driver/screenshot.cpp
 acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: e83a255e95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/fb-setmode

Conflicts:
   src/driver/screenshot.h
   src/driver/screenshot.cpp
   acinclude.m4


------------------
This commit was generated by Migit
2017-03-17 12:43:25 +01:00
Michael Liebmann
160599210d Merge branch 'master' into pu/mp
Conflicts:
 src/driver/screenshot.cpp
 src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e4678c6d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/mp

Conflicts:
   src/driver/screenshot.cpp
   src/Makefile.am


------------------
This commit was generated by Migit
2017-03-17 12:34:28 +01:00