Ignore:
Timestamp:
2015-06-08T18:25:08Z (9 years ago)
Author:
dequis <dx@…>
Children:
29ff5c2
Parents:
c720890 (diff), 61e7e02 (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 'develop' into feat/hip-cat

Conflicts:

configure

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/skype/Makefile

    rc720890 re4f08bf  
    1919install-doc:
    2020        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
    21         $(INSTALL) -m644 skyped.1 $(DESTDIR)$(MANDIR)/man1
     21        $(INSTALL) -m644 $(_SRCDIR_)skyped.1 $(DESTDIR)$(MANDIR)/man1
    2222
    2323uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.