Changeset 3d5701e for doc/theses

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

Location:

doc/theses/thierry_delisle_PhD

Files:

• .gitignore (added)
• code/Makefile (added)
• code/assert.hpp (added)
• code/bts_test.cpp (added)
• code/prefetch.cpp (added)
• code/processor.hpp (added)
• code/processor_list.hpp (added)
• code/processor_list_fast.cpp (added)
• code/processor_list_good.cpp (added)
• code/randbit.cpp (added)
• code/relaxed_list.cpp (added)
• code/relaxed_list.hpp (added)
• code/relaxed_list_layout.cpp (added)
• code/scale.sh (added)
• code/utils.hpp (added)
• comp_II/Makefile (added)
• comp_II/comp_II.tex (added)
• comp_II/comp_II_too_big.tex (added)
• comp_II/glossary.tex (added)
• comp_II/local.bib (added)