diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-05-06 17:10:31 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-05-06 17:10:31 -0700 |
| commit | 0aab8135dae526b090dcb1ffab801023ac4084aa (patch) | |
| tree | 3aa615a5196bddc76ff23a5e4b3ae6ab04a40588 /AUTHORS | |
| parent | eb05316a471da962eefe82c9b9a16a7590653ba7 (diff) | |
| parent | def948f052a758850cadc022943517742b299441 (diff) | |
| download | xscope-0aab8135dae526b090dcb1ffab801023ac4084aa.tar.gz | |
Merge branch 'keithp'
Conflicts:
common.c
decode11.c
fd.c
fd.h
print11.c
prtype.c
scope.c
scope.h
server.c
table11.c
x11.h
xscope.man
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1 +1,2 @@ James Peterson, MCC +Keith Packard |