diff options
author | B Stack <bgstack15@gmail.com> | 2020-04-03 15:37:51 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-04-03 15:37:51 +0000 |
commit | 0560e0a0f122698d44b5fda4f39c0158f5f6ec81 (patch) | |
tree | af3658a050028eb914180c8ddd83a33b0ba5a611 /src/usr/share/applications/logout-manager-trayicon.desktop | |
parent | bump version to 0.0.4 (diff) | |
parent | Merge branch 'add-trayicon' into 'master' (diff) | |
download | logout-manager-0560e0a0f122698d44b5fda4f39c0158f5f6ec81.tar.gz logout-manager-0560e0a0f122698d44b5fda4f39c0158f5f6ec81.tar.bz2 logout-manager-0560e0a0f122698d44b5fda4f39c0158f5f6ec81.zip |
Merge branch 'master' into 'dev'
# Conflicts:
# src/Makefile
# src/usr/bin/logout-manager-trayicon
Diffstat (limited to 'src/usr/share/applications/logout-manager-trayicon.desktop')
0 files changed, 0 insertions, 0 deletions