1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00

Merge pull request #24 from ZDroid/patch-1

Github -> GitHub, conky -> Conky
This commit is contained in:
Brenden Matthews 2013-09-15 09:42:55 -07:00
commit b5f8ea5069

View File

@ -8,7 +8,6 @@ any kind of information on your desktop.
- Stable version: [**1.9.0**][stable-src] - Stable version: [**1.9.0**][stable-src]
- Development version: [**master**][devel-src] - Development version: [**master**][devel-src]
### Features ### Features
Conky can display more than 300 built-in objects, including support for: Conky can display more than 300 built-in objects, including support for:
@ -29,7 +28,6 @@ Conky can display more than 300 built-in objects, including support for:
Conky can display information either as text, or using simple progress Conky can display information either as text, or using simple progress
bars and graph widgets, with different fonts and colours. bars and graph widgets, with different fonts and colours.
### Screenshots ### Screenshots
[![screenshot](https://github.com/brndnmtthws/conky/wiki/configs/brenden/screenshot-thumb.png)](https://raw.github.com/wiki/brndnmtthws/conky/configs/brenden/screenshot.png) [![screenshot](https://github.com/brndnmtthws/conky/wiki/configs/brenden/screenshot-thumb.png)](https://raw.github.com/wiki/brndnmtthws/conky/configs/brenden/screenshot.png)
@ -37,12 +35,11 @@ bars and graph widgets, with different fonts and colours.
[![screenshot](https://github.com/brndnmtthws/conky/wiki/configs/jc/screenshot-thumb.png)](https://raw.github.com/wiki/brndnmtthws/conky/configs/jc/screenshot.png) [![screenshot](https://github.com/brndnmtthws/conky/wiki/configs/jc/screenshot-thumb.png)](https://raw.github.com/wiki/brndnmtthws/conky/configs/jc/screenshot.png)
See the [User Configs](https://github.com/brndnmtthws/conky/wiki/User-Configs) section of the wiki for more See the [User Configs](https://github.com/brndnmtthws/conky/wiki/User-Configs) section of the wiki for more
screenshots and their associated conky config files. screenshots and their associated Conky config files.
### Documentation ### Documentation
The [Github Wiki](https://github.com/brndnmtthws/conky/wiki) serves as a central hub for all of The [GitHub Wiki](https://github.com/brndnmtthws/conky/wiki) serves as a central hub for all of
Conky's documentation. Quick links: Conky's documentation. Quick links:
* [Install](https://github.com/brndnmtthws/conky/wiki/Installation) * [Install](https://github.com/brndnmtthws/conky/wiki/Installation)
@ -50,13 +47,11 @@ Conky's documentation. Quick links:
* [User Configs](https://github.com/brndnmtthws/conky/wiki/User-Configs) * [User Configs](https://github.com/brndnmtthws/conky/wiki/User-Configs)
* [Frequently Asked Questions](https://github.com/brndnmtthws/conky/wiki/FAQ) * [Frequently Asked Questions](https://github.com/brndnmtthws/conky/wiki/FAQ)
### License ### License
Conky is licensed under the terms of the [GPLv3](LICENSE.GPL) and Conky is licensed under the terms of the [GPLv3](LICENSE.GPL) and
[BSD](LICENSE.BSD) licenses. [BSD](LICENSE.BSD) licenses.
[MPD]: http://musicpd.org/ [MPD]: http://musicpd.org/
[XMMS2]: http://wiki.xmms2.xmms.se/index.php/Main_Page [XMMS2]: http://wiki.xmms2.xmms.se/index.php/Main_Page
[BMPx]: http://bmpx.backtrace.info/site/BMPx_Homepage [BMPx]: http://bmpx.backtrace.info/site/BMPx_Homepage
@ -69,4 +64,3 @@ Conky is licensed under the terms of the [GPLv3](LICENSE.GPL) and
[ircconky]: irc://irc.freenode.net/conky [ircconky]: irc://irc.freenode.net/conky
[Imlib2]: http://docs.enlightenment.org/api/imlib2/html/ [Imlib2]: http://docs.enlightenment.org/api/imlib2/html/
[cairo]: http://www.cairographics.org/ [cairo]: http://www.cairographics.org/