diff options
| author | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
| commit | f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781 (patch) | |
| tree | 93f6a81820d0d868dd7a086145db5ce3971cf509 /data/images/oxygen-icons/dialog-error.png | |
| parent | cb5f07a8bac7afbbb0c43622d6c831295b6889cb (diff) | |
| parent | c1fa3959fbffb381e067dcd619d528412e235401 (diff) | |
Merge branch 'develop' into deb-0.7.0-rc1
Conflicts:
docs/man/bitmask-root.1.rst
Diffstat (limited to 'data/images/oxygen-icons/dialog-error.png')
0 files changed, 0 insertions, 0 deletions