diff options
| author | raveit65 <[email protected]> | 2013-10-23 12:04:15 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2013-10-23 12:04:15 +0200 |
| commit | 48f9063d6247d8ac4feeae64784bfb1030691b31 (patch) | |
| tree | 812dd9c11008774e1caee4d4595640850cd9efee /AUTHORS | |
| parent | 24f70a17b3e6438b835caadedae7a6c0eed83da7 (diff) | |
| parent | 3d368610cef04faed66b9da837c7613589ec76b2 (diff) | |
| download | mate-icon-theme-48f9063d6247d8ac4feeae64784bfb1030691b31.tar.bz2 mate-icon-theme-48f9063d6247d8ac4feeae64784bfb1030691b31.tar.xz | |
fix merge conflict
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions