Skip to content

Commit 90b6546

Browse files
committed
Merge branch 'master' into global-thread-pool
2 parents 0f0a792 + 915aaa2 commit 90b6546

File tree

2 files changed

+1
-165
lines changed

2 files changed

+1
-165
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ ibm.value #=> 187.57
145145

146146
## License and Copyright
147147

148-
*Concurrent Ruby* is Copyright © 2013 [Jerry D'Antonio](https://twitter.com/jerrydantonio).
148+
*Concurrent Ruby* is Copyright © 2014 [Jerry D'Antonio](https://twitter.com/jerrydantonio).
149149
It is free software released under the [MIT License](http://www.opensource.org/licenses/MIT).
150150

151151
The *Concurrent Ruby* logo was designed by [David Jones](https://twitter.com/zombyboy).

demos/tvar-demo.rb

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)