Ignore:
Timestamp:
Jul 14, 2020, 1:39:15 PM (16 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
0aec496
Parents:
e1801fc (diff), b4cd58ed (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.in

    re1801fc rf5d4f62  
    246246        bits/align.hfa bits/containers.hfa bits/defs.hfa \
    247247        bits/debug.hfa bits/locks.hfa containers/list.hfa \
    248         containers/stackLockFree.hfa concurrency/coroutine.hfa \
    249         concurrency/thread.hfa concurrency/kernel.hfa \
    250         concurrency/monitor.hfa concurrency/mutex.hfa \
    251         concurrency/invoke.h
     248        containers/stackLockFree.hfa concurrency/iofwd.hfa \
     249        concurrency/coroutine.hfa concurrency/thread.hfa \
     250        concurrency/kernel.hfa concurrency/monitor.hfa \
     251        concurrency/mutex.hfa concurrency/invoke.h
    252252HEADERS = $(nobase_cfa_include_HEADERS)
    253253am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    470470#----------------------------------------------------------------------------------------------------------------
    471471@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
    472 @BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa containers/stackLockFree.hfa
     472@BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa \
     473@BUILDLIB_TRUE@         containers/list.hfa containers/stackLockFree.hfa concurrency/iofwd.hfa
    473474
    474475@BUILDLIB_FALSE@headers =
Note: See TracChangeset for help on using the changeset viewer.