12 Commits (4d7b515801bd6cd509242a717321f1b0644960d6)

Author	SHA1	Message	Date
Dingyuan Wang	22bcf8be7a	Merge master and jieba3k, make the code Python 2/3 compatible	10 years ago
Dingyuan Wang	6fad5fbb2c	update to v0.33	11 years ago
ZoeyYoung	dce353f88b	merge from master	12 years ago
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	12 years ago
fxsjy	b77645b3aa	modify test_file.py; use less memory	12 years ago
Linker Lin	5d83855088	自动检测CPU数目，启动合适数目的进程。	12 years ago
Linker Lin	2ceb981da0	自动检测CPU数目，启动合适数目的进程。	12 years ago
Sun Junyi	b62f052927	PEP8	12 years ago
Sun Junyi	45daf561c7	follow PEP8: change tab to 4 white spaces	12 years ago
fxsjy	aae91b6fb6	merge change from master to jieba3k	12 years ago
fxsjy	9bebe6120b	utf-8 output is more friendly to Linux	12 years ago
fxsjy	62cf22121f	new feature: parallel segment with multiprocessing	12 years ago