1. 26 Feb, 2015 2 commits
    • Merge remote-tracking branch 'origin/master' into embb390_algorithms · 0f7719f9
      Conflicts:
      	algorithms_cpp/test/count_test.cc
      	base_c/include/embb/base/c/internal/platform.h
      	base_c/test/alloc_test.h
      	base_c/test/condition_var_test.h
      	base_c/test/core_set_test.h
      	base_c/test/counter_test.h
      	base_c/test/duration_test.h
      	base_c/test/thread_index_test.h
      	base_c/test/thread_specific_storage_test.h
      	base_c/test/thread_test.h
      	base_c/test/time_test.h
      	base_cpp/include/embb/base/core_set.h
      	base_cpp/include/embb/base/duration.h
      	base_cpp/include/embb/base/exceptions.h
      	base_cpp/include/embb/base/internal/duration-inl.h
      	base_cpp/include/embb/base/internal/mutex-inl.h
      	base_cpp/include/embb/base/internal/thread-inl.h
      	base_cpp/include/embb/base/internal/thread_closures.h
      	base_cpp/include/embb/base/internal/thread_specific_storage-inl.h
      	base_cpp/include/embb/base/thread_specific_storage.h
      	base_cpp/include/embb/base/time.h
      	base_cpp/test/thread_test.h
      	dataflow_cpp/include/embb/dataflow/internal/inputs.h
      Tobias Fuchs committed
  2. 25 Feb, 2015 5 commits
  3. 24 Feb, 2015 10 commits
  4. 23 Feb, 2015 4 commits
  5. 18 Feb, 2015 1 commit
  6. 11 Feb, 2015 2 commits
  7. 03 Feb, 2015 7 commits
  8. 02 Feb, 2015 9 commits