diff options
author | Perberos <[email protected]> | 2011-11-15 18:51:08 -0300 |
---|---|---|
committer | Perberos <[email protected]> | 2011-11-15 18:51:08 -0300 |
commit | 237f016f4f8441212f85f268f0806c33fed7591b (patch) | |
tree | 650eeb6d6fad6e3fd1c9b674bba40264c4b6b09a | |
parent | ae2b93a6f78a987062a96a34907be3b343436577 (diff) | |
download | mate-applets-237f016f4f8441212f85f268f0806c33fed7591b.tar.bz2 mate-applets-237f016f4f8441212f85f268f0806c33fed7591b.tar.xz |
fixing file conflict on battstat applet
-rw-r--r-- | battstat/sounds/mate-battstat_applet.soundlist.in (renamed from battstat/sounds/battstat_applet.soundlist.in) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/battstat/sounds/battstat_applet.soundlist.in b/battstat/sounds/mate-battstat_applet.soundlist.in index a5387709..a5387709 100644 --- a/battstat/sounds/battstat_applet.soundlist.in +++ b/battstat/sounds/mate-battstat_applet.soundlist.in |