384 commits

Author	SHA1	Message	Date
adam j hartz	528a6a8683	merge from master	2016-06-10 16:00:12 -04:00
adam j hartz	79fa0185f6	merge from master	2016-06-10 20:08:30 +01:00
adam j hartz	31f8a0cfc3	merge from master	2016-06-10 14:50:29 -04:00
adam j hartz	b11d77dad7	update changelog	2016-06-10 14:48:47 -04:00
adam j hartz	1d4c81274f	changelog update	2016-06-10 14:48:02 -04:00
Morten Enemark Lund	2c6b19d89b	Add entry to CHANGELOG.rst	2016-06-10 14:16:40 +02:00
Will S	25731b5cd1	Change stopped jobs on exit prompt text	2016-06-10 06:35:18 -04:00
adam j hartz	daaab24c29	changelog	2016-06-09 23:39:44 -04:00
Anthony Scopatz	0a921d5db7	changelog	2016-06-09 22:54:50 -04:00
adam j hartz	8b2f8e0a2a	changelog fixes	2016-06-09 22:29:05 -04:00
adam j hartz	283144fcc9	merge from master	2016-06-09 21:38:37 -04:00
adam j hartz	a98ad0f2f9	merge from master	2016-06-09 21:36:44 -04:00
Anthony Scopatz	d4c6a8054d	branchg mods	2016-06-09 21:35:51 -04:00
adam j hartz	d038b4ba1d	merge from eode:master into master	2016-06-09 21:33:09 -04:00
adam j hartz	966ec8e9e3	merge from master	2016-06-09 21:29:41 -04:00
adam j hartz	e9c40c7cb8	merge from master	2016-06-09 21:19:43 -04:00
Anthony Scopatz	3f03cfb729	Merge pull request #1192 from adqm/sigmask ... Cygwin Fix	2016-06-09 21:11:37 -04:00
adam j hartz	4467e94758	merge from master	2016-06-09 18:19:26 -04:00
adam j hartz	3984a0840e	docs	2016-06-09 22:53:37 +01:00
Jeremy Donahue	e5af234ee7	Updated changelog to reflect new fg() args	2016-06-09 09:23:23 -07:00
Brian Visel	578abc4d02	Merged upstream code to sync pull request #1183	2016-06-09 06:15:50 -04:00
adam j hartz	b841e0b775	merge from master	2016-06-09 03:35:06 -04:00
adam j hartz	e734fd84d8	merge from master	2016-06-09 03:19:24 -04:00
adam j hartz	04ab2bbef8	merge from master	2016-06-09 03:17:23 -04:00
Brian Visel	051e8e9a29	Updated changelog	2016-06-09 03:01:28 -04:00
Anthony Scopatz	e2c6a82ad9	fixed conflict	2016-06-09 02:58:44 -04:00
adam j hartz	f5627047e8	merge from master	2016-06-09 02:56:10 -04:00
adam j hartz	e92f82098e	merge from master	2016-06-09 02:52:31 -04:00
adam j hartz	85bc3588eb	update changelog	2016-06-09 02:51:32 -04:00
Anthony Scopatz	cc0f7f3033	Merge pull request #1185 from mitnk/fix-prompt-and-title ... Fix crash caused by malformed prompt or title	2016-06-09 02:45:42 -04:00
Anthony Scopatz	51518756da	merge and fix conflict	2016-06-09 01:44:34 -04:00
Hugo Wang	6dc835a9fd	fix crase caused by malformed prompt or title	2016-06-09 10:51:50 +08:00
adam j hartz	08828db7cf	update changelog	2016-06-08 20:59:58 -04:00
adam j hartz	ef70c53bb9	Merge branch 'master' into fuzzy_completions	2016-06-08 20:57:52 -04:00
adam j hartz	d36eb8066d	Merge branch 'cryzed-feature-1169'	2016-06-08 20:25:08 -04:00
adam j hartz	be54245ad3	merge from cryzed:fix-1173 into master	2016-06-08 20:09:08 -04:00
cryzed	2fcc19e89c	Move changelog line to current developments	2016-06-09 01:57:08 +02:00
cryzed	cbffccf57a	Move changelog line to current developments	2016-06-09 01:56:37 +02:00
cryzed	d0fa91daf9	Implement suggestions made on IRC and GitHub	2016-06-09 01:55:53 +02:00
cryzed	d9408c4335	Added line to changelog	2016-06-09 01:35:07 +02:00
cryzed	218e94cecb	Added line to changelog	2016-06-09 01:31:27 +02:00
cryzed	f2b0a35023	Added line to changelog	2016-06-09 01:29:45 +02:00
adam j hartz	5130782777	version bump to 0.3.4	2016-06-08 14:25:52 -04:00
adam j hartz	d027432e3b	remove typo completion, add subsequence completion	2016-06-08 01:29:15 -04:00
Anthony Scopatz	20db4bbe6e	Merge branch 'master' into vc	2016-06-08 01:15:54 -04:00
Anthony Scopatz	3f9aaffd29	added cl entries	2016-06-08 00:58:37 -04:00
adam j hartz	97792410a4	add tab completion for the completer alias	2016-06-07 23:43:48 -04:00
adam j hartz	ca939243d3	associated changelog entry	2016-06-07 23:42:07 -04:00
adam j hartz	61a9b47252	Merge branch 'defaults_on_win' of https://github.com/scopatz/xonsh into melund-defaults_on_win	2016-06-07 22:47:45 -04:00
adam j hartz	e383043803	changelog	2016-06-07 20:50:13 -04:00