4 commits

Author	SHA1	Message	Date
Dan Hirsch	d6c0eaf3de	Merge remote-tracking branch 'upstream/master' ... Conflicts: NOTES	2012-05-04 21:27:09 +01:00
Dan Hirsch	2af69dd8f9	Sped up charset parsing; fixed choice operator	2012-05-04 21:23:56 +01:00
Meredith L. Patterson	709884faf5	difference and xor combinators done.	2012-05-03 02:31:22 +01:00
Meredith L. Patterson	19e36e1cfe	Fixed build (completed butnot combinator). Also, fixed bug where sequence wasn't bailing out if one parser failed.	2012-05-03 01:40:23 +01:00