Changeset b75671d for Makefile


Ignore:
Timestamp:
2015-06-17T22:47:26Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
b441614
Parents:
d832164 (diff), 2f99f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/master' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rd832164 rb75671d  
    2020
    2121all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) doc systemd
    22 ifdef SKYPE_PI
    23         $(MAKE) -C protocols/skype doc
    24 endif
    2522
    2623doc:
Note: See TracChangeset for help on using the changeset viewer.