sway - Fork of https://github.com/swaywm/sway with my patches automatically merged

	Commit message (Expand)	Author	Age
...
* \| \| \| \|	small fix, default width/height 0	taiyu	2015-08-20
* \| \| \| \|	unnessesary log	taiyu	2015-08-20
* \| \| \| \|	setup for resizable windows, drop weight	taiyu	2015-08-20
\| \|/ / / \|/\| \| \|
* \| \| \|	changes	taiyu	2015-08-20
* \| \| \|	remove debug message	taiyu	2015-08-19
* \| \| \|	another small fix to move_focus	taiyu	2015-08-19
* \| \| \|	small fix	taiyu	2015-08-19
* \| \| \|	input state, find_container_in_direction	taiyu	2015-08-19
* \| \| \|	key_state.ch, and command conflicts resolved	taiyu	2015-08-19
\|/ / /
* \| \|	Deal with more xkb bullshit	Drew DeVault	2015-08-19
* \| \|	Whitelist a handful of characters for keys	Drew DeVault	2015-08-19
* \| \|	Merge pull request #93 from Luminarys/master	Drew DeVault	2015-08-19
\|\ \ \
\| * \| \|	Fixed mode_toggle	Luminarys	2015-08-19
\|/ / /
* \| \|	Improve key handling somewhat	Drew DeVault	2015-08-19
* \| \|	Improve key buffer handling	Drew DeVault	2015-08-19
* \| \|	Remove logging of all key presess	Drew DeVault	2015-08-19
* \| \|	Merge pull request #92 from z33ky/master	Drew DeVault	2015-08-19
\|\ \ \
\| * \| \|	Fix potential memory leak	Alexander 'z33ky' Hirsch	2015-08-20
\| * \| \|	Minor style fix	Alexander 'z33ky' Hirsch	2015-08-20
\| * \| \|	Fix potential crash when toggling fullscreen mode	Alexander 'z33ky' Hirsch	2015-08-20
* \| \| \|	Fix error with workspace/output name matching	Drew DeVault	2015-08-19
\|/ / /
* \| \|	fixed default active_workspace, and more use of set_focused_container_for(...)	taiyu	2015-08-19
* \| \|	use enums for pointer click names	taiyu	2015-08-19
* \| \|	fixed active_workspace update on focus change	taiyu	2015-08-19
* \| \|	Merge branch 'master' of https://github.com/SirCmpwn/sway	taiyu	2015-08-19
\|\ \ \
\| * \ \	Merge pull request #90 from taiyu-len/master	Drew DeVault	2015-08-19
\| \|\ \ \
* \| \| \| \|	fixed	taiyu	2015-08-19
\| \|/ / / \|/\| \| \|
* \| \| \|	man page update	taiyu	2015-08-19
* \| \| \|	floating mode_toggle	taiyu	2015-08-19
\|/ / /
* \| \|	Minor style fix	Luminarys	2015-08-19
* \| \|	Merge pull request #89 from taiyu-len/master	Drew DeVault	2015-08-19
\|\ \ \
\| * \| \|	style	taiyu	2015-08-19
\| * \| \|	reset floating view on floating_mod repress	taiyu	2015-08-19
* \| \| \|	Merge pull request #88 from aouelete/master	Drew DeVault	2015-08-19
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fixed config path	aouelete	2015-08-19
\|/ / /
* \| \|	pointer uses its own modifiers	taiyu	2015-08-19
* \| \|	Merge pull request #87 from Luminarys/master	taiyu	2015-08-19
\|\ \ \
\| * \ \	Fixed conflicts	Luminarys	2015-08-19
\| \|\ \ \
\| \| * \| \|	More merge resolution.	Ezra	2015-08-19
\| \| * \| \|	Resolved merge conflicts	Luminarys	2015-08-19
\| \| * \| \|	Added in resize locking	Luminarys	2015-08-19
\| * \| \| \|	Resize lock fixes	Luminarys	2015-08-19
\| * \| \| \|	Added in resize locking	Luminarys	2015-08-19
\|/ / / /
* \| \| \|	removed debug which shouldnt be there	taiyu	2015-08-19
* \| \| \|	floating_modifier uses mod_keys instead of anykey	taiyu	2015-08-19
* \| \| \|	Merge pull request #86 from Luminarys/master	Drew DeVault	2015-08-19
\|\\| \| \|
\| * \| \|	Fixed config loading	Luminarys	2015-08-19
\|/ / /
* \| \|	Set test to NULL when appropriate	Drew DeVault	2015-08-19
* \| \|	Free environment vars after loading config	Drew DeVault	2015-08-19
* \| \|	Refactor config file loading	Drew DeVault	2015-08-19