Commit Graph

3477 Commits

Author SHA1 Message Date
vanhofen
a44c4bf1b8 channellist.cpp: allow colored events (for time) in right eventlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddbac1b248
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: allow colored events (for time) in right eventlist

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

------------------
This commit was generated by Migit
2013-02-17 21:55:21 +01:00
vanhofen
18c1d242d1 icons: remove unneeded ddfill.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: b19bd87580
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- icons: remove unneeded ddfill.png

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

------------------
This commit was generated by Migit
2013-02-17 21:39:10 +01:00
Jacek Jendrzej
5d4baefb89 src/gui/infoviewer.cpp: fix div by zero
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc78c5738
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-16 (Sat, 16 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-16 21:25:02 +01:00
vanhofen
2a6783f83e icons: remove unneeded radio.jpg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5357724b4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: remove unneeded radio.jpg

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

------------------
This commit was generated by Migit
2013-02-16 16:38:05 +01:00
vanhofen
d84cef071b icons: add missing multimedia.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa1d9ce450
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: add missing multimedia.png

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

------------------
This commit was generated by Migit
2013-02-16 13:14:50 +01:00
vanhofen
317d65f0f4 icons: add missing hint_restart.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe3f4ce863
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: add missing hint_restart.png

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

------------------
This commit was generated by Migit
2013-02-16 10:28:38 +01:00
vanhofen
72fd77bb5f Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 8b1b3b1418
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)



------------------
This commit was generated by Migit
2013-02-15 22:55:45 +01:00
vanhofen
2b9e5b9bd9 fix terrible typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe78bf0580
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-14 (Thu, 14 Feb 2013)

Origin message was:
------------------
- fix terrible typo

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

------------------
This commit was generated by Migit
2013-02-14 19:16:54 +01:00
vanhofen
8bd6190170 infoviewer.cpp: change width of infobar.txt-field ...
... in dependency from g_settings.infobar_progressbar


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0986c3af8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-14 (Thu, 14 Feb 2013)

Origin message was:
------------------
- infoviewer.cpp: change width of infobar.txt-field ...

... in dependency from g_settings.infobar_progressbar


------------------
This commit was generated by Migit
2013-02-14 19:14:47 +01:00
Michael Liebmann
e98cad9904 channellist.cpp: Show channel list vertically centered
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d76a9487
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Show channel list vertically centered

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

------------------
This commit was generated by Migit
2013-02-13 23:34:55 +01:00
Michael Liebmann
d1a7930db8 Sort english.locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7f250c2a7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* Sort english.locale

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

------------------
This commit was generated by Migit
2013-02-13 11:41:04 +01:00
vanhofen
05933cc072 yweb: remove unused variable from Y_Boxcontrol_Menue.yhtm
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73d44517e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- yweb: remove unused variable from Y_Boxcontrol_Menue.yhtm

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

------------------
This commit was generated by Migit
2013-02-12 23:16:45 +01:00
vanhofen
88b988942b yweb: merge tv-shot and osd-shot to one page
* use internal screenshot-function to make osd-shots


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71f2c8c9a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- yweb: merge tv-shot and osd-shot to one page

* use internal screenshot-function to make osd-shots


------------------
This commit was generated by Migit
2013-02-12 23:12:20 +01:00
Michael Liebmann
d91211cf74 channellist.cpp: Fix time display in event list
- fix compiler warning


Origin commit data
------------------
Branch: ni/coolstream
Commit: b2f5ca589d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Fix time display in event list

- fix compiler warning


------------------
This commit was generated by Migit
2013-02-12 21:34:18 +01:00
Jacek Jendrzej
7b1136be21 add progressbar hint loc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fb981b447
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 19:26:46 +01:00
Jacek Jendrzej
a46d3a42ef add progressbar opt to infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 18:03:50 +01:00
tomworld
177ebb4fba channellist.cpp: Use extra font for event list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list

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

------------------
This commit was generated by Migit
2013-02-12 15:45:27 +01:00
Michael Liebmann
75aa795138 sectionsd.cpp: Remove invalid events (duration <= 1 sec.) from event list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e9cc3d837
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 15:45:27 +01:00
vanhofen
fb7b462bbd controlapi.cpp: make ScreenshotCGI() more configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 133740da14
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- controlapi.cpp: make ScreenshotCGI() more configurable

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

------------------
This commit was generated by Migit
2013-02-12 13:58:21 +01:00
vanhofen
6e650d822b yweb: fix a little syntax error in Y_Settings_nhttpd.yhtm
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08fd651d60
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- yweb: fix a little syntax error in Y_Settings_nhttpd.yhtm

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

------------------
This commit was generated by Migit
2013-02-12 13:21:43 +01:00
vanhofen
f1476814ea yweb: add the workbox around the remote control
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9feb5249a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- yweb: add the workbox around the remote control

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

------------------
This commit was generated by Migit
2013-02-12 11:31:41 +01:00
Jacek Jendrzej
ce549b87b4 src/gui/infoviewer.cpp: fix channel name getRenderWidth for unicode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 158ad4243f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-11 10:39:34 +01:00
vanhofen
111fd98545 yweb: supplement to c50fa440ac
* add a background-image to zoomshot-button


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2b22e656e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- yweb: supplement to c50fa440ac

* add a background-image to zoomshot-button


------------------
This commit was generated by Migit
2013-02-10 23:25:16 +01:00
vanhofen
b9eccd608c neutrino.cpp: remove double determination of g_info.delivery_system
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4f8bf17a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- neutrino.cpp: remove double determination of g_info.delivery_system

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

------------------
This commit was generated by Migit
2013-02-10 22:00:22 +01:00
vanhofen
8b1b3b1418 channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode

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

------------------
This commit was generated by Migit
2013-02-10 21:03:43 +01:00
Michael Liebmann
dd85ec4ee5 update_ext.cpp: Fix wildcard handling for delete list
Origin commit data
------------------
Branch: ni/coolstream
Commit: de36ce60c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-10 (Sun, 10 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-10 17:26:51 +01:00
TangoCash
132c4abd78 channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


------------------
This commit was generated by Migit
2013-02-09 10:36:11 +01:00
vanhofen
c50fa440ac yweb: rework Y_Tools_remote_osd.yhtm
* use only one file to make osd-shots
* add a (not really) zoom-function
* add posibility to change filename
* add needed locals
* remove Y_Tools_fbshot.yhtm


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2668d2f2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- yweb: rework Y_Tools_remote_osd.yhtm

* use only one file to make osd-shots
* add a (not really) zoom-function
* add posibility to change filename
* add needed locals
* remove Y_Tools_fbshot.yhtm


------------------
This commit was generated by Migit
2013-02-06 22:14:10 +01:00
vanhofen
aba592b157 channellist.cpp: fix restore to fullTV
... when turning miniTV off from the menu inside the channellist


Origin commit data
------------------
Branch: ni/coolstream
Commit: c6155f29b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix restore to fullTV

... when turning miniTV off from the menu inside the channellist


------------------
This commit was generated by Migit
2013-02-06 21:19:49 +01:00
vanhofen
99ceae9f06 channellist.cpp: 'fix' the double determination of dimensions/coordinates
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4635b690f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: 'fix' the double determination of dimensions/coordinates

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

------------------
This commit was generated by Migit
2013-02-05 23:56:48 +01:00
vanhofen
c5de0e7e67 channellist.cpp: determinate startTimeWidth from a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6f4ea5baa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: determinate startTimeWidth from a fixed value

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

------------------
This commit was generated by Migit
2013-02-05 17:01:18 +01:00
vanhofen
05945fdeed channellist.cpp: remove time for no further events
thx to TangoCash.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ed166d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: remove time for no further events

thx to TangoCash.


------------------
This commit was generated by Migit
2013-02-05 01:36:28 +01:00
vanhofen
21694b1d47 channellist.cpp: fix wrong time for no further events
patch by TangoCash. thx!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3bdb3bbc07
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix wrong time for no further events

patch by TangoCash. thx!


------------------
This commit was generated by Migit
2013-02-05 00:58:31 +01:00
vanhofen
f199acd4b7 osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line
Origin commit data
------------------
Branch: ni/coolstream
Commit: e07e95bfb2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line

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

------------------
This commit was generated by Migit
2013-02-05 00:44:13 +01:00
vanhofen
00d0c54a19 channellist.cpp: fix shortcuts in submenu and add a seperator line
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee0cb25258
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix shortcuts in submenu and add a seperator line

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

------------------
This commit was generated by Migit
2013-02-05 00:30:16 +01:00
vanhofen
536c7913ab osd_setup.cpp: add 'channellist.additional' to channellist's submenu
very ugly: same code two times


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce0025c7cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: add 'channellist.additional' to channellist's submenu

very ugly: same code two times


------------------
This commit was generated by Migit
2013-02-04 23:43:16 +01:00
vanhofen
ca1569c428 channellist: make miniTV switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable

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

------------------
This commit was generated by Migit
2013-02-04 22:25:15 +01:00
vanhofen
368800c80d yweb: disable horizontal scrolling in screenshot-pages
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01c6cf0104
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- yweb: disable horizontal scrolling in screenshot-pages

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

------------------
This commit was generated by Migit
2013-02-04 15:07:27 +01:00
Michael Liebmann
9554af5953 src/gui/channellist.cpp: miniTV fix locale
- Add locale for menuhint
- Sort header for locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c85803632
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-03 (Sun, 03 Feb 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV fix locale

- Add locale for menuhint
- Sort header for locale


------------------
This commit was generated by Migit
2013-02-03 07:38:45 +01:00
vanhofen
5c3119d73f channellist.cpp: rework header and buttonbar
* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


Origin commit data
------------------
Branch: ni/coolstream
Commit: 77bbdfa0c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-02 (Sat, 02 Feb 2013)

Origin message was:
------------------
- channellist.cpp: rework header and buttonbar

* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


------------------
This commit was generated by Migit
2013-02-02 02:10:35 +01:00
vanhofen
28a4b5f5d6 channellist.cpp: change color for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone

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

------------------
This commit was generated by Migit
2013-02-01 23:26:33 +01:00
vanhofen
95a719d92e channellist.cpp: fix round borders for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec4a5bf3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix round borders for infozone

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

------------------
This commit was generated by Migit
2013-02-01 22:59:07 +01:00
Michael Liebmann
3378aeeb50 src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49667088f7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV osd fix

- Screen coordinate x could possibly receive a value under 0


------------------
This commit was generated by Migit
2013-01-31 20:05:03 +01:00
vanhofen
2ec2af7c3f cables.xml: add "antennengemeinschaft penig"
thx Zeng!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8d0e156e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
- cables.xml: add "antennengemeinschaft penig"

thx Zeng!


------------------
This commit was generated by Migit
2013-01-31 17:28:18 +01:00
Stefan Seyfried
b18550b836 getservices: fix FindChannelFuzzy()
* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0995ff5042
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
getservices: fix FindChannelFuzzy()

* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway


------------------
This commit was generated by Migit
2013-01-31 16:51:43 +01:00
Jacek Jendrzej
fe38ed371a src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 16:18:05 +01:00
Jacek Jendrzej
ec290afd12 add .rej ~ to .gitignore
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43aaec7cfc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
-add .rej ~ to .gitignore

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

------------------
This commit was generated by Migit
2013-01-31 12:24:34 +01:00
Jacek Jendrzej
141b1b9d65 src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
3ca4aae394 delete src/neutrino.cpp.~ .rej
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15623981df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 23:52:31 +01:00
Jacek Jendrzej
1798a3e20d delete src/gui/channellist.cpp.rej
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d1f1e3ae9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 23:49:43 +01:00