diff options
author | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-06-06 19:58:25 +0200 |
---|---|---|
committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-06-06 19:58:25 +0200 |
commit | ecebdd0c0603bcad2b306a0bb660b1028c78bed8 (patch) | |
tree | 6f0b058f576c03e176741a498de2ec8710fd9ec0 /plugins/notify/notify.c | |
parent | 1a857fc4e64e4ad9d7ceae0797e8d9f260ad7398 (diff) | |
parent | 1cd417fc09faec13357268141767b24b8033eea7 (diff) |
Merge branch 'master' of https://github.com/Lithopsian/deadbeef into Lithopsian-master
Conflicts:
plugins/liboggedit/Makefile.am
Diffstat (limited to 'plugins/notify/notify.c')
0 files changed, 0 insertions, 0 deletions