diff options
author | 2010-11-12 02:07:14 +1100 | |
---|---|---|
committer | 2010-11-12 02:07:14 +1100 | |
commit | 1b0ce336693243054580e07b4514c598257d4422 (patch) | |
tree | 71af04f124f2853c0018e3c7d85e942591658910 /xdgmimeint.c | |
parent | 0cf2a1eb3382a6384b61a6edd577d387b9b62766 (diff) | |
parent | b9b6e867df9718ec17d36f8cd6771cd9a337c46b (diff) |
Merged changes from codemonkey and grissiom branches
Conflicts:
kill.c
seq.in
Diffstat (limited to 'xdgmimeint.c')
0 files changed, 0 insertions, 0 deletions