Changeset e4f08bf for doc/Makefile


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

  • doc/Makefile

    rc720890 re4f08bf  
    55
    66all:
    7         # Only build the docs if this is a git tree
    8         test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide
     7        $(MAKE) -C user-guide
    98
    109install:
Note: See TracChangeset for help on using the changeset viewer.