diff options
| author | Stefan Ritter <xeno@thehappy.de> | 2011-05-30 09:17:43 +0200 |
|---|---|---|
| committer | Stefan Ritter <xeno@thehappy.de> | 2011-05-30 09:17:43 +0200 |
| commit | 14deaec2f669cb59ffd6ff6cb59c1f9942ec6024 (patch) | |
| tree | 36a6e02ae7b3c057188488fd400db17213171359 /xorg | |
| parent | 55d5c812ef5405c6a4c946f5c776721c370fe398 (diff) | |
| parent | 5034b54a232e11778509d651619682ba47311c78 (diff) | |
Merge branch 'master' of fucktheforce.de:xeno
Conflicts:
xorg/xresources
Diffstat (limited to 'xorg')
0 files changed, 0 insertions, 0 deletions