diff options
author | David <dbphillipsnz@gmail.com> | 2014-07-20 13:25:37 +1200 |
---|---|---|
committer | David <dbphillipsnz@gmail.com> | 2014-07-20 13:25:37 +1200 |
commit | ff7fb8228934bcecbe93f0ce5b15dd032d0b286b (patch) | |
tree | b25f054759dda2c94c87cc3d8facfd31bd6aaa45 /themes/default/traybat-40-charging.png | |
parent | f33d490cc017c0a4915bb2ec175df0238702442b (diff) | |
parent | 24a150d3b0b1d4f42ffa5459f5a126415c96c6b4 (diff) | |
download | paramano-ff7fb8228934bcecbe93f0ce5b15dd032d0b286b.tar.xz |
Merge branch 'master' into stable
Conflicts:
Makefile
tray.c
trayfreq.conf.src
trayfreq_set_interface.c
Diffstat (limited to 'themes/default/traybat-40-charging.png')
0 files changed, 0 insertions, 0 deletions