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

Merge branch 'master' of git.omp.am:/home/omp/git/conky

This commit is contained in:
Brenden Matthews 2009-08-01 14:30:27 -06:00
commit a3e4b3dd41

View File

@ -339,8 +339,8 @@
optional arguments. Use this hook for drawing things on
top of what Conky draws. Conky puts 'conky_' in front
of function_name to prevent accidental calls to the
wrong function unless you put you place 'conky_' in
front of it yourself.</para>
wrong function unless you place 'conky_' in front of
it yourself.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -357,8 +357,8 @@
optional arguments. Use this hook for drawing things on
top of what Conky draws. Conky puts 'conky_' in front
of function_name to prevent accidental calls to the
wrong function unless you put you place 'conky_' in
front of it yourself.</para>
wrong function unless you place 'conky_' in front of
it yourself.</para>
</listitem>
</varlistentry>
<varlistentry>