Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 31, 2015
  1. Merge pull request #44 from snoyberg/master

    authored
    Version bumps
  2. @snoyberg

    Version bumps

    snoyberg authored
Commits on Feb 20, 2015
Commits on Feb 17, 2015
  1. Merge pull request #43 from bgamari/master

    authored
    Bump deepseq upper bound
  2. @bgamari

    Hide traverse from Prelude

    bgamari authored
    Burning bridges fallout
  3. @bgamari

    Bump utf8-string upper bound

    bgamari authored
  4. @bgamari

    Bump deepseq upper bound

    bgamari authored
Commits on Feb 4, 2015
Commits on Feb 1, 2015
  1. blaze CHANGELOG

    authored
  2. minor version bump

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

    authored
    Be more selective about Blaze imports
  2. @david-christiansen

    Be more selective about Blaze imports

    david-christiansen authored
    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
Commits on Jul 25, 2014
  1. Merge branch 'text'

    authored
  2. 1.5 not 1.5.0

    authored
  3. 1.5: notFollowedBy CHANGELOG

    authored
Commits on Jul 21, 2014
  1. minor version bump

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

    authored
    Support parsers version >= 0.12
  2. @larskuhtz
Commits on Jun 27, 2014
  1. Merge pull request #32 from ivan-m/patch-1

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

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

    authored
  2. Merge pull request #27 from trofi/master

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

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

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

    authored
  2. 1.4.1: GHC 7.8.1rc2 compat

    authored
  3. Merge branch 'master' of github.com:ekmett/trifecta

    authored
    Conflicts:
    	src/Text/Trifecta/Result.hs
    	trifecta.cabal
  4. 1.4

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

    authored
    GHC.Exts exports a toList/fromList with ghc-7.8
Something went wrong with that request. Please try again.