« back to all changes in this revision
Viewing changes to tools/hudkeywords/Makefile.am
- Committer: Ted Gould
- Date: 2013-03-15 11:41:51 UTC
- mfrom: (227.101.19 disting-tests)
- mto: (227.3.121 phablet)
- mto: This revision was merged to the branch mainline in revision 245.
- Revision ID: ted@gould.cx-20130315114151-im8sr15c3rrqno2s
Merging the disting-tests branch to resolve conflicts
- files removed:
- tests/test-app-indicator.c
- files modified:
- tests/Makefile.am
added
removed
tools/hudkeywords/Makefile.am
