ZoeyYoung 2857ae45cc Merge branch 'master' into jieba3k ...

Conflicts:
	Changelog
	jieba/__init__.py
	jieba/finalseg/__init__.py
	jieba/posseg/__init__.py
	setup.py
	test/parallel/test_file.py
	test/test_file.py

2013-08-21 13:55:21 +08:00

..

parallel

Merge branch 'master' into jieba3k

2013-08-21 13:55:21 +08:00

demo.py

修改demo.py的代码格式，使得符合pep8规范

2013-05-11 17:40:42 +02:00

extract_tags.py

PEP8

2013-07-03 17:21:21 +08:00

extract_topic.py

PEP8

2013-07-03 17:21:21 +08:00

foobar.txt

fix bug and change version

2013-04-27 09:45:39 +08:00

jieba_test.py

fix conflict of merging

2013-07-03 17:47:45 +08:00

jiebacmd.py

PEP8

2013-07-03 17:21:21 +08:00

test_change_dictpath.py

PEP8

2013-07-03 17:21:21 +08:00

test_cut_for_search.py

PEP8

2013-07-03 17:21:21 +08:00

test_cutall.py

PEP8

2013-07-03 17:21:21 +08:00

test_file.py

Merge branch 'master' into jieba3k

2013-08-21 13:55:21 +08:00

test_multithread.py

PEP8

2013-07-03 17:21:21 +08:00

test_pos_file.py

PEP8

2013-07-03 17:21:21 +08:00

test_pos.py

PEP8

2013-07-03 17:21:21 +08:00

test_tokenize.py

fix conflict of merging

2013-07-03 17:47:45 +08:00

test_userdict.py

PEP8

2013-07-03 17:21:21 +08:00

test_whoosh_flie_read.py

update whoosh example

2013-07-04 09:31:09 +08:00

test_whoosh_flie.py

update whoosh example

2013-07-04 09:31:09 +08:00

test_whoosh.py

merge change from master

2013-07-16 11:06:41 +08:00

test.py

merge change from master

2013-07-16 11:06:41 +08:00

test.txt

improve POS tagging

2012-11-06 07:17:26 +08:00

userdict.txt

update test case

2013-05-02 17:01:16 +08:00