Changeset 230b16 for pcp/src


Ignore:
Timestamp:
Dec 16, 2009, 4:18:41 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
281324
Parents:
20a828 (diff), b7f3f3 (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 'FixVersioning2' into FixDegeneratedTesselation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pcp/src/Makefile.am

    r20a828 r230b16  
    77FORCE:
    88$(srcdir)/.git-version: FORCE
    9         @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe --tags HEAD) > .git-version-t 2>/dev/null \
     9        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe HEAD) > .git-version-t 2>/dev/null \
    1010          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
    1111          mv -f .git-version-t $(srcdir)/.git-version; \
Note: See TracChangeset for help on using the changeset viewer.