diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-04 23:40:18 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-04 23:40:18 +0100 |
| commit | f31795883fe7dbe2c8c9c048725f817c87431b30 (patch) | |
| tree | b6b5dcc656d4082e9d64e7d0826dc3bf8e340785 /src/display.h | |
| parent | 4387edf32220e94de94af7879dd19077782ab7b6 (diff) | |
| parent | 5d68aca266e1797024c74fde5e13fe04b2594bcf (diff) | |
Merge branch 'master' of ssh://wg.reiner-h.de:30022/data/src/oxen
Conflicts:
doc/uidesign.txt
Diffstat (limited to 'src/display.h')
0 files changed, 0 insertions, 0 deletions