Skip to content
Commits on Feb 17, 2015
  1. @bgamari

    Bump utf8-string upper bound

    bgamari committed Feb 16, 2015
  2. @bgamari

    Bump deepseq upper bound

    bgamari committed Feb 16, 2015
Commits on Feb 4, 2015
Commits on Feb 1, 2015
  1. blaze CHANGELOG

    committed Feb 1, 2015
  2. minor version bump

    committed Feb 1, 2015
Commits on Jan 18, 2015
  1. Merge pull request #40 from david-christiansen/fix-blaze-conflict

    Be more selective about Blaze imports
    committed Jan 18, 2015
  2. @david-christiansen

    Be more selective about Blaze imports

    This prevents a build failure due to ambiguous identifier when building
    against blaze-builder-0.3.3.4, blaze-markup-0.6.3.0, and
    blaze-html-0.7.0.3.
    
    The error was:
    
    src/Text/Trifecta/Highlight.hs:46:15:
        Ambiguous occurrence ‘Comment’
        It could refer to either ‘Text.Blaze.Internal.Comment’,
                                 imported from ‘Text.Blaze.Internal’ at src/Text/Trifecta/Highlight.hs:35:1-26
                              or ‘Text.Parser.Token.Highlight.Comment’,
                                 imported from ‘Text.Parser.Token.Highlight’ at src/Text/Trifecta/Highlight.hs:36:1-34
    david-christiansen committed Jan 18, 2015
Commits on Jul 25, 2014
  1. 1.5.1 CHANGELOG and version bump

    committed Jul 25, 2014
  2. Merge branch 'text'

    committed Jul 25, 2014
  3. 1.5 not 1.5.0

    committed Jul 25, 2014
  4. 1.5: notFollowedBy CHANGELOG

    committed Jul 25, 2014
Commits on Jul 21, 2014
  1. minor version bump

    committed Jul 21, 2014
Commits on Jul 14, 2014
  1. Merge pull request #33 from alephcloud/master

    Support parsers version >= 0.12
    committed Jul 14, 2014
  2. Support parsers version >= 0.12

    Lars Kuhtz committed Jul 14, 2014
Commits on Jun 27, 2014
  1. Merge pull request #32 from ivan-m/patch-1

    Also include the example text file in the package
    committed Jun 27, 2014
  2. @ivan-m
  3. Merge pull request #31 from CodeBlock/patch-1

    Bump mtl and transformers upper bound
    committed Jun 26, 2014
Commits on Jun 26, 2014
  1. @relrod
Commits on Apr 3, 2014
  1. minor version bump

    committed Apr 3, 2014
  2. Merge pull request #27 from trofi/master

    trifecta.cabal: allow latest blaze-html and blaze-markup
    committed Apr 3, 2014
Commits on Mar 8, 2014
  1. @trofi

    trifecta.cabal: allow latest blaze-html and blaze-markup

    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    trofi committed Mar 8, 2014
Commits on Mar 6, 2014
  1. update copyright

    committed Mar 6, 2014
  2. 1.4.1: GHC 7.8.1rc2 compat

    committed Mar 6, 2014
  3. Merge branch 'master' of github.com:ekmett/trifecta

    Conflicts:
    	src/Text/Trifecta/Result.hs
    	trifecta.cabal
    committed Mar 6, 2014
  4. 1.4

    committed Mar 6, 2014
Commits on Feb 17, 2014
  1. Merge pull request #26 from aavogt/master

    GHC.Exts exports a toList/fromList with ghc-7.8
    committed Feb 17, 2014
  2. @aavogt
Commits on Feb 10, 2014
  1. Merge pull request #25 from nwf/master

    Use lens>=4 type names, bump deps
    committed Feb 9, 2014
  2. Merge pull request #24 from nwf/master

    Use lens>=4 newtype names, bump deps
    committed Feb 9, 2014
  3. Use lens>=4 type names, bump deps

    Nathaniel Wesley Filardo committed Feb 9, 2014
  4. Use lens>=4 newtype names, bump deps

    Nathaniel Wesley Filardo committed Feb 9, 2014
Commits on Jan 15, 2014
  1. Removed trailing whitespace

    committed Jan 15, 2014
Something went wrong with that request. Please try again.