Changeset f453a7f


Ignore:
Timestamp:
2015-05-28T18:14:35Z (9 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
0f7eccff
Parents:
bef322e (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 develop

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rbef322e rf453a7f  
    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.