summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-06-11 11:29:29 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-06-11 11:29:29 -0700
commit87e23f5f523fc1c5b6ece12f6a812f26820e4da7 (patch)
tree117f3ad47a3e4085969d25c45920ce8180173021 /src
parentde6989a068982a216621082c01dd1db3861940f8 (diff)
parent949c5caba25f6273bd87b09a8aa568227bd44240 (diff)
downloadscala-87e23f5f523fc1c5b6ece12f6a812f26820e4da7.tar.gz
scala-87e23f5f523fc1c5b6ece12f6a812f26820e4da7.tar.bz2
scala-87e23f5f523fc1c5b6ece12f6a812f26820e4da7.zip
Merge pull request #700 from jsuereth/fix-libs-in-buildv2.10.0-M4
Fix libs in build
Diffstat (limited to 'src')
-rw-r--r--src/forkjoin/scala/concurrent/util/Unsafe.java (renamed from src/library/scala/concurrent/util/Unsafe.java)0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/util/Unsafe.java b/src/forkjoin/scala/concurrent/util/Unsafe.java
index 0cd48758d5..0cd48758d5 100644
--- a/src/library/scala/concurrent/util/Unsafe.java
+++ b/src/forkjoin/scala/concurrent/util/Unsafe.java