diff options
| author | Rob Adams <readams@src.gnome.org> | 2003-03-15 02:12:02 +0000 |
|---|---|---|
| committer | Rob Adams <readams@src.gnome.org> | 2003-03-15 02:12:02 +0000 |
| commit | cc7493cac9d254ed34e21c917811bc525ee778c8 (patch) | |
| tree | 24a0a9764bc8f7aa634b82103f4afdeb2164a464 /src/screen.c | |
| parent | be96be95f6f84854568f1a95d2ab300430fea764 (diff) | |
| download | metacity-cc7493cac9d254ed34e21c917811bc525ee778c8.tar.gz | |
resolve a merge conflict
Diffstat (limited to 'src/screen.c')
0 files changed, 0 insertions, 0 deletions