Code

Merge 1.0.x into master#51

Code

Merged

gourlaysama merged 7 commits intoscala:masterscala/scala-parser-combinators:masterfrom

lrytz:merge-1.0.xlrytz/scala-parser-combinators:merge-1.0.xCopy head branch name to clipboard

May 8, 2015

Commits

Commits on Apr 15, 2015

• [backport] Fix misleading error message when using optional or repeatedly parser #34

  Show description for 127aa45
  

  Amal Elshihaby

  authored and

  gourlaysama

  committed
  127aa45

  Copy full SHA for 127aa45

• Merge pull request #49 from gourlaysama/backports

  Show description for ca9fae1
  gourlaysama

  committed
  ca9fae1

  Copy full SHA for ca9fae1

Commits on Apr 22, 2015

• move to scala 2.11.6 and sbt 0.13.8

  gourlaysama

  committed
  4e0277b

  Copy full SHA for 4e0277b

Commits on Apr 23, 2015

• Merge pull request #50 from gourlaysama/bump-scala-version

  Show description for 0b6d642
  gourlaysama

  committed
  0b6d642

  Copy full SHA for 0b6d642

Commits on Apr 30, 2015

• Update the scala-modules plugin to 1.0.3

  Show description for 689d179
  lrytz

  committed
  689d179

  Copy full SHA for 689d179

• update version numbers for v1.0.4

  lrytz

  committed
  aa98174

  Copy full SHA for aa98174

• Merge branch '1.0.x' into merge-1.0.x

  lrytz

  committed
  753933b

  Copy full SHA for 753933b