diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
commit | 8ab1e32a479c018766f330ecf71670ef71492300 (patch) | |
tree | 529350bcb00d23c8c404510c594e4a6c5ffa6394 /configure.ac | |
parent | 29177ac24ce70208a6225669a1275f67ac0f647a (diff) | |
parent | 0aae7813af4bb9ccdc4f02ba7cd483c8967078f1 (diff) |
Merge commit 'origin/lp349874'
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
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 2f473cb..66e139b 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ src/sugar/bundle/Makefile src/sugar/graphics/Makefile src/sugar/presence/Makefile src/sugar/tutorius/Makefile +src/sugar/tutorius/uam/Makefile src/sugar/datastore/Makefile po/Makefile.in ]) |