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

	Commit message (Collapse)	Author	Age
...
*	Merge pull request #92 from z33ky/master	Drew DeVault	2015-08-19
\|\ \| \| \| \|	A couple of cppcheck issues
\| *	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
\| *	Merge pull request #90 from taiyu-len/master	Drew DeVault	2015-08-19
\| \|\ \| \| \| \| \| \|	floating mode_toggle
* \| \|	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
\|\ \| \| \| \|	reset floating view on floating_mod repress
\| *	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
\| *	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
\|\ \| \| \| \|	Added in resize locking
\| *	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
\| *	Fixed config loading	Luminarys	2015-08-19
\|/
*	Set test to NULL when appropriate	Drew DeVault	2015-08-19
\| \| \| \|	Thanks @SyedAmerGilani
*	Free environment vars after loading config	Drew DeVault	2015-08-19
\| \| \| \|	Thanks @SyedAmerGilani
*	Refactor config file loading	Drew DeVault	2015-08-19
\|
*	Merge pull request #79 from taiyu-len/master	Drew DeVault	2015-08-19
\|\ \| \| \| \|	fixed floating_modifier related things
\| *	fixed some more bugs, moved layout_log into log.ch, restored focus_parent	taiyu	2015-08-19
\| \|
\| *	fixed focus key handler	taiyu	2015-08-19
\| \|
\| *	fixed floating_modifier related things	taiyu	2015-08-18
\| \|
* \|	Merge pull request #80 from SyedAmerGilani/fix_memory_leaks	Drew DeVault	2015-08-19
\|\ \ \| \| \| \| \| \|	fix a few possible memory leaks
\| * \|	fix a few possible memory leaks	Syed Amer Gilani	2015-08-19
\| \|/
* \|	Merge pull request #81 from SyedAmerGilani/fix_xdg_config_home	Drew DeVault	2015-08-19
\|\ \ \| \|/ \|/\|	fixed string building for XDG_CONFIG_HOME config loading
\| *	fixed string building for XDG_CONFIG_HOME config loading	Syed Amer Gilani	2015-08-19
\|/
*	focus to only child	taiyu	2015-08-18
\|
*	Fixed full screen workspace switch focusing	Luminarys	2015-08-18
\|
*	fixed focus on fullscreen view destroy	taiyu	2015-08-18
\|
*	header update	Luminarys	2015-08-18
\|
*	Removed debugging, added in proper gap resets for config reloads	Luminarys	2015-08-18
\|
*	Merge pull request #74 from Luminarys/master	Drew DeVault	2015-08-18
\|\ \| \| \| \|	Added in proper floating window resizing
\| *	Minor fixes that might be helpful later	Luminarys	2015-08-18
\| \|
\| *	Fixes to make floating windows work better	Luminarys	2015-08-18
\| \|