Merge branch 'master' into scmastermaster
commitbcfc2ff792bfe07852bf9d477030d74134df7863
authorTim Blechmann <tim@klingt.org>
Sat, 9 Feb 2013 16:54:40 +0000 (9 17:54 +0100)
committerTim Blechmann <tim@klingt.org>
Sat, 9 Feb 2013 16:54:40 +0000 (9 17:54 +0100)
treee1ae62a1c4617373dd04ae887239ef21de27abd8
parent97d976dbc5194989c6fa651bce2ae2a837b66f9e
parent9ca89933ce343714871ff6d9d97b5f9593e88986
Merge branch 'master' into scmaster
nova-tt/spin_lock.hpp