1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 09:44:04 +00:00

Merge branch '1.8.0' into 1.8.1

This commit is contained in:
Pavel Labath 2010-01-30 17:56:22 +01:00
commit 44a4ffae91

View File

@ -1072,10 +1072,10 @@ void generate_text_internal(char *p, int p_max_size,
print_diskiograph(obj, p, p_max_size); print_diskiograph(obj, p, p_max_size);
} }
OBJ(diskiograph_read) { OBJ(diskiograph_read) {
print_diskiograph(obj, p, p_max_size); print_diskiograph_read(obj, p, p_max_size);
} }
OBJ(diskiograph_write) { OBJ(diskiograph_write) {
print_diskiograph(obj, p, p_max_size); print_diskiograph_write(obj, p, p_max_size);
} }
#endif /* X11 */ #endif /* X11 */
OBJ(downspeed) { OBJ(downspeed) {