Code

Merge 1.0.x to master (i.e. 1.1.x)#115

Code

Merged

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

gourlaysama:merge-1.0.x-mastergourlaysama/scala-parser-combinators:merge-1.0.x-masterCopy head branch name to clipboard

May 4, 2017

Commits

Commits on Dec 16, 2016

• bump scala, sbt & scala-js dependency versions

  gourlaysama

  committed
  6c52b6a

  Copy full SHA for 6c52b6a

• Merge pull request #92 from gourlaysama/bump4

  Show description for acddd21
  SethTisue

  authored
  acddd21

  Copy full SHA for acddd21

Commits on Dec 31, 2016

• Update latest API link, add getting started link

  raboof

  authored
  fbf3d08

  Copy full SHA for fbf3d08

• Add link to 'Building a lexer and parser with Scala's Parser Combinators'

  raboof

  committed
  33792d3

  Copy full SHA for 33792d3

Commits on Jan 3, 2017

• Merge pull request #93 from raboof/patch-1

  Show description for 94e25a3
  gourlaysama

  authored
  94e25a3

  Copy full SHA for 94e25a3

• Update version and README for v1.0.5

  gourlaysama

  committed
  c0dabd9

  Copy full SHA for c0dabd9

• link to Programming in Scala from README.md

  SethTisue

  committed
  0e3326f

  Copy full SHA for 0e3326f

• Merge pull request #94 from gourlaysama/update-post-1.0.5

  Show description for 5d733ef
  gourlaysama

  authored
  5d733ef

  Copy full SHA for 5d733ef

• Merge pull request #95 from SethTisue/odersky-venners-spoon

  Show description for 04a2f50
  gourlaysama

  authored
  04a2f50

  Copy full SHA for 04a2f50

Commits on Jan 6, 2017

• Add "Getting Started" section to README

  Show description for 7df76d7
  raboof

  authored
  7df76d7

  Copy full SHA for 7df76d7

Commits on Jan 11, 2017

• Move 'Getting Started' guide to separate file

  raboof

  committed
  48dc032

  Copy full SHA for 48dc032

• Add Getting Started example to the README

  raboof

  committed
  f536e54

  Copy full SHA for f536e54

Commits on Jan 19, 2017

• Merge pull request #96 from raboof/getting_started

  Show description for d0d847d
  gourlaysama

  authored
  d0d847d

  Copy full SHA for d0d847d

Commits on Feb 6, 2017

• Syntax highlight

  ladinu

  authored
  f1a47ee

  Copy full SHA for f1a47ee

• Merge pull request #98 from ladinu/patch-1

  Show description for cf326ad
  gourlaysama

  authored
  cf326ad

  Copy full SHA for cf326ad

Commits on Feb 8, 2017

• speed up Travis builds using caching feature

  gourlaysama

  committed
  d901210

  Copy full SHA for d901210

• Merge pull request #100 from gourlaysama/travis-caching

  Show description for 5ec6af9
  gourlaysama

  authored
  5ec6af9

  Copy full SHA for 5ec6af9

Commits on Feb 13, 2017

• Update Getting_Started.md

  zandbee

  authored
  399bbb8

  Copy full SHA for 399bbb8

Commits on Feb 14, 2017

• Deprecate scala.util.parsing.json

  Show description for 7815fd9
  janekdb

  committed
  7815fd9

  Copy full SHA for 7815fd9

• Merge pull request #103 from janekdb/issue/github/99/deprecate-scala.util.parsing.json

  Show description for d118db9
  gourlaysama

  authored
  d118db9

  Copy full SHA for d118db9

Commits on Feb 15, 2017

• Merge pull request #102 from Zandbee/patch-1

  Show description for f09b0ec
  gourlaysama

  authored
  f09b0ec

  Copy full SHA for f09b0ec

Commits on Feb 20, 2017

• Improve parser combinator documentation

  Show description for 6ca3c3d
  gourlaysama

  committed
  6ca3c3d

  Copy full SHA for 6ca3c3d

Commits on Feb 22, 2017

• Merge pull request #106 from gourlaysama/improve-scaladoc-output

  Show description for eb5bc9a
  gourlaysama

  authored
  eb5bc9a

  Copy full SHA for eb5bc9a

Commits on Apr 28, 2017

• Allow building an existing tag against a new Scala version

  Show description for 6cac8c3
  lrytz

  committed
  6cac8c3

  Copy full SHA for 6cac8c3

• Also cross-build against 2.13.0-M1

  lrytz

  committed
  26d971a

  Copy full SHA for 26d971a

• Merge pull request #109 from lrytz/tag-with-scala-version

  Show description for 0da708b
  gourlaysama

  authored
  0da708b

  Copy full SHA for 0da708b

Commits on May 2, 2017

• Disable publishing of root project

  gourlaysama

  committed
  9b705dd

  Copy full SHA for 9b705dd

• Merge pull request #112 from gourlaysama/no-root-publish

  Show description for 65802b5
  gourlaysama

  authored
  65802b5

  Copy full SHA for 65802b5

• Update scala version in README and build.sbt

  gourlaysama

  committed
  0982f5e

  Copy full SHA for 0982f5e

• Merge pull request #114 from gourlaysama/bump4

  Show description for 2cb29f8
  gourlaysama

  authored
  2cb29f8

  Copy full SHA for 2cb29f8

Commits on May 3, 2017

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

  Show description for 5a972f2
  gourlaysama

  committed
  5a972f2

  Copy full SHA for 5a972f2