Merge pull request #22 in SCALA/mainline from dev to master
* commit 'd1c2be1d6aebd3f8922fcad5b4d670ef4a3632a8':
Added examples of pattern matching on generic/parameterized types (including shapeless typesafe cast examples)
Modify field b, rather than terminal field (ie. final field) c, to make functionality more explicit
Added Tolerance examples
Added scalactic TripleEquals examples
Removed ScalaUtils class, since scalautils has been renamed scalactic
Upgraded to akka streams 1.0-M1
Merge pull request #20 in SCALA/mainline from feature/SCALA-9-pattern-matching-with-generics to dev
* commit '303b80108cf2c492f1885a1f6f9420fa486adef5':
Added examples of pattern matching on generic/parameterized types (including shapeless typesafe cast examples)
Merge pull request #19 in SCALA/mainline from feature/SCALA-8-show-shapeless-generics-amends-can to dev
* commit 'ac306aea44090ac2a19097a14cd6e7a82f2cc293':
Modify field b, rather than terminal field (ie. final field) c, to make functionality more explicit
Merge pull request #18 in SCALA/mainline from feature/SCALA-7-scalautils-examples to dev
* commit '5f2287f98c28dca3fc776b079f683330debc47ae':
Added Tolerance examples
Added scalactic TripleEquals examples
Removed ScalaUtils class, since scalautils has been renamed scalactic
Merge pull request #17 in SCALA/mainline from feature/SCALA-6-upgrade-akka-streams to dev
* commit '5655aefea3c9181785e89c6a2e7ee173cea20e31':
Upgraded to akka streams 1.0-M1
Merge pull request #16 in SCALA/mainline from dev to master
* commit '1c867458e4bdb4470c0a00779fcf2d1df882c538':
Only include junit/scalatest dependencies for test package
Moved tests out to test package
Merge pull request #15 in SCALA/mainline from feature/SCALA-3-test-package to dev
* commit '05ba43e49ed7d1cf7797a6d2d3f3d894fce18343':
Only include junit/scalatest dependencies for test package
Moved tests out to test package
Merge pull request #14 in SCALA/mainline from dev to master
* commit '4391a3e11e99d3a81e9c52b42c0d426b5fc354bb':
Ensure path-based patterns are absolute
Merge pull request #13 in SCALA/mainline from feature/SCALA-1-git-migration to dev
* commit '36f03c36f978b2f0aa76a7e66ccab8d8bdd05ea3':
Ensure path-based patterns are absolute
Merge pull request #11 in SCALA/mainline from dev to master
* commit '43706d99eb4ff9e8c8e3c028d3baf04b2d078f86':
Hack: sleep for 100 millis to workaround unknown race condition causing sporadic test failures
Clone mutable collections before using them, in order that they don't change under our feet
Fixed typo
Moved rxscala examples to test folder
Added log.mailmap recommendation SCALA-1 Added mailmap file, to standardise email addresses
Ensure correct files are ignored
Moved src directories to src/main/scala to match gradle conventions
Merge pull request #12 in SCALA/mainline from feature/SCALA-5-rxscala-test-cases-failing-sporadically to dev
* commit '9a0ce3943b30d230de44f6f3b47dd45b625f9844':
Hack: sleep for 100 millis to workaround unknown race condition causing sporadic test failures
Merge pull request #10 in SCALA/mainline from feature/SCALA-3-test-package to dev
* commit '3642123e4fb117e4e56db51d581337119ac2061d':
Clone mutable collections before using them, in order that they don't change under our feet
Fixed typo
Moved rxscala examples to test folder
Merge pull request #9 in SCALA/mainline from feature/SCALA-1-git-migration to dev
* commit 'a8f4bf18e00800b1cdb7c87f66100702148672b1':
Added log.mailmap recommendation
Merge pull request #8 in SCALA/mainline from feature/SCALA-2-project-layout to dev
* commit '1017bda5055a19b72d56a644946f9ecce5dd45e3':
Moved src directories to src/main/scala to match gradle conventions
Merge pull request #7 in SCALA/mainline from feature/SCALA-1-git-migration to dev
* commit '7b73edc1230419631a3dfa5f432dc05a2168df20': SCALA-1 Added mailmap file, to standardise email addresses
Ensure correct files are ignored
Merge pull request #6 in SCALA/mainline from dev to master
* commit 'edede09d3f6410642b9c814c8771bf85c8b06445':
Changed hg to git instructions in README, and obfuscated proxy url
Merge pull request #5 in SCALA/mainline from feature/SCALA-1-git-migration to dev
* commit 'bf7ed5e850fbf7f643658705d122d6169c355788':
Changed hg to git instructions in README, and obfuscated proxy url
Merge pull request #4 in SCALA/mainline from dev to master
* commit 'ed21ca65a3455a03f226099f0c0b2539754489ae':
Re-enable gradle daemon (since bamboo user home directory now fixed)
Disable daemon for now, since it breaks bamboo CI
Rationalised .gitignores
No-op commit to trigger bamboo
Removed FXDevTrading (it's moved to a separate repo)
Added .gitignore files
Merge pull request #3 in SCALA/mainline from feature/git-migration to dev
* commit '84283853f5f66f2bf886c86e5da857e9a4691f7d':
Re-enable gradle daemon (since bamboo user home directory now fixed)
Merge pull request #2 in SCALA/mainline from feature/git-migration to dev
* commit '2ad06bc058f4631ccc7827cb10df593c33b45e51':
Disable daemon for now, since it breaks bamboo CI
Rationalised .gitignores
Added .gitignore files