diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-24 21:00:52 -0800 |
| commit | 51c7741040d95c5deece939dae5e4136cc04afc4 (patch) | |
| tree | 96631ee5aa9fd0c8c45f019ff154cc4fc8ca85d0 /Makefile.am | |
| parent | d1dbe3b69e6f95ef8ecd4cf959863b922ab47c66 (diff) | |
| parent | 4e47c44d335276cf0dc5ed3a0756e50c98c1b9b9 (diff) | |
Merge branch 'buttonbox'
Conflicts:
doc/telemetrum-doc.xsl
Pull the buttbox version of the docs in as it had been updated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 264e577a..2c412bf9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=src ao-tools ao-utils +SUBDIRS=src altosui ao-tools ao-utils EXTRA_DIST = ChangeLog |