diff options
| author | Timothy Pearson <[email protected]> | 2014-11-12 15:01:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-11-12 15:01:36 -0600 |
| commit | d74fed9b65e4c5e742a3fe81a05b83201ccf591a (patch) | |
| tree | 679088bca9ef010b9785605cdda841b64929e69b /khelpcenter/searchhandlers/htdig.desktop | |
| parent | b0c4ab328e98e611c61ce2b34b4535e0120781bd (diff) | |
| parent | 325fb4c2983cb3211138078bff9cbec749be21c8 (diff) | |
| download | tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.tar.gz tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.zip | |
Merge remote-tracking branch 'compton-update/master'
Conflicts:
twin/compton-tde/common.h
twin/compton-tde/compton.c
twin/compton-tde/opengl.c
Diffstat (limited to 'khelpcenter/searchhandlers/htdig.desktop')
0 files changed, 0 insertions, 0 deletions