Move mutex from Attic to src to deal with merge conflict

12 files changed, 0 insertions, 0 deletions

diff --git a/Attic/mutex/noop_mutex/info.txt b/src/mutex/noop_mutex/info.txt
index 1f49f5e1c..1f49f5e1c 100644
--- a/Attic/mutex/noop_mutex/info.txt
+++ b/src/mutex/noop_mutex/info.txt
diff --git a/Attic/mutex/noop_mutex/mux_noop.cpp b/src/mutex/noop_mutex/mux_noop.cpp
index 5c45084fe..5c45084fe 100644
--- a/Attic/mutex/noop_mutex/mux_noop.cpp
+++ b/src/mutex/noop_mutex/mux_noop.cpp
diff --git a/Attic/mutex/noop_mutex/mux_noop.h b/src/mutex/noop_mutex/mux_noop.h
index 94201cb7c..94201cb7c 100644
--- a/Attic/mutex/noop_mutex/mux_noop.h
+++ b/src/mutex/noop_mutex/mux_noop.h
diff --git a/Attic/mutex/pthreads/info.txt b/src/mutex/pthreads/info.txt
index 88de70de0..88de70de0 100644
--- a/Attic/mutex/pthreads/info.txt
+++ b/src/mutex/pthreads/info.txt
diff --git a/Attic/mutex/pthreads/mux_pthr.cpp b/src/mutex/pthreads/mux_pthr.cpp
index 9f1d9816e..9f1d9816e 100644
--- a/Attic/mutex/pthreads/mux_pthr.cpp
+++ b/src/mutex/pthreads/mux_pthr.cpp
diff --git a/Attic/mutex/pthreads/mux_pthr.h b/src/mutex/pthreads/mux_pthr.h
index 118853947..118853947 100644
--- a/Attic/mutex/pthreads/mux_pthr.h
+++ b/src/mutex/pthreads/mux_pthr.h
diff --git a/Attic/mutex/qt_mutex/info.txt b/src/mutex/qt_mutex/info.txt
index a21108c79..a21108c79 100644
--- a/Attic/mutex/qt_mutex/info.txt
+++ b/src/mutex/qt_mutex/info.txt
diff --git a/Attic/mutex/qt_mutex/mux_qt.cpp b/src/mutex/qt_mutex/mux_qt.cpp
index 0f670c8b4..0f670c8b4 100644
--- a/Attic/mutex/qt_mutex/mux_qt.cpp
+++ b/src/mutex/qt_mutex/mux_qt.cpp
diff --git a/Attic/mutex/qt_mutex/mux_qt.h b/src/mutex/qt_mutex/mux_qt.h
index 5aed77f4b..5aed77f4b 100644
--- a/Attic/mutex/qt_mutex/mux_qt.h
+++ b/src/mutex/qt_mutex/mux_qt.h
diff --git a/Attic/mutex/win32_crit_section/info.txt b/src/mutex/win32_crit_section/info.txt
index a2d339c3b..a2d339c3b 100644
--- a/Attic/mutex/win32_crit_section/info.txt
+++ b/src/mutex/win32_crit_section/info.txt
diff --git a/Attic/mutex/win32_crit_section/mux_win32.cpp b/src/mutex/win32_crit_section/mux_win32.cpp
index 2a967892b..2a967892b 100644
--- a/Attic/mutex/win32_crit_section/mux_win32.cpp
+++ b/src/mutex/win32_crit_section/mux_win32.cpp
diff --git a/Attic/mutex/win32_crit_section/mux_win32.h b/src/mutex/win32_crit_section/mux_win32.h
index a91850e71..a91850e71 100644
--- a/Attic/mutex/win32_crit_section/mux_win32.h
+++ b/src/mutex/win32_crit_section/mux_win32.h