diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-09-16 06:46:59 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-09-16 06:46:59 -0700 |
| commit | eab850ed3b1e763e247ec424fad68bce78b9ff04 (patch) | |
| tree | 4ff92120fb417f08174f6cac5117552d0a4791d0 /configure.ac | |
| parent | 9f1b4c23f2de00b6921958a0b041aa0e8f2c44ef (diff) | |
| parent | 25ce85eed58da8608c5573b23fc821869fc9bc4a (diff) | |
Merge commit 'whot/master' into master
I decided to keep the Xproto renaming I had, which restored the original
names with the p prefix.
Conflicts:
xts5/scenarios/Xproto_scen
xts5/tet_scen
xts5/tset/Xproto/.gitignore
xts5/tset/Xproto/AllocColorCells/AllocColorCells.m
...
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8398ae92..affa90f3 100644 --- a/configure.ac +++ b/configure.ac @@ -105,6 +105,7 @@ src/tet3/tcm/Makefile src/tet3/tcc/Makefile src/tet3/tcclib/Makefile xts5/Makefile +xts5/scenarios/Makefile xts5/src/Makefile xts5/src/lib/Makefile xts5/src/libproto/Makefile |