Skip to content

Merged upstream changes into master#1

Open
joshovi wants to merge 34 commits into
darxriggs:masterfrom
joshovi:master
Open

Merged upstream changes into master#1
joshovi wants to merge 34 commits into
darxriggs:masterfrom
joshovi:master

Conversation

@joshovi

@joshovi joshovi commented Mar 31, 2015

Copy link
Copy Markdown

No description provided.

sethwoodworth and others added 30 commits August 20, 2014 14:37
README.TXT: document requirements for excel and sqlite wrappers
Conflicts:
	extComments/extComments.pl
	lib/Ninka/rules.dict
	matcher/matcher.pl
	ninka.pl
Conflicts:
	README
	extComments/extComments.pl
	extComments/hashComments.pl
	filter/filter.pl
	lib/Ninka/criticalwords.dict
	matcher/matcher.pl
	ninka.pl
	senttok/senttok.pl
	splitter/splitter.pl
@joshovi joshovi force-pushed the master branch 2 times, most recently from 36223e7 to 6bee8cd Compare May 26, 2015 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants