Changeset bef322e


Ignore:
Timestamp:
2015-05-28T17:46:23Z (10 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
51b14b8, f453a7f
Parents:
6191263 (diff), 08a9323 (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

  • protocols/skype/Makefile

    r6191263 rbef322e  
    1717        ./test.py
    1818
    19 doc: $(MANPAGES)
    20 
    21 install-doc: doc
     19install-doc:
    2220        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
    23         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
     21        $(INSTALL) -m644 skyped.1 $(DESTDIR)$(MANDIR)/man1
    2422
    2523uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.