Changeset c720890


Ignore:
Timestamp:
2015-05-28T18:15:20Z (10 years ago)
Author:
dequis <dx@…>
Children:
e4f08bf
Parents:
51b14b8 (diff), d304445 (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 branch 'master' into feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r51b14b8 rc720890  
    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.