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

	Commit message (Collapse)	Author	Age
*	Feature for #1078: Configurable swaylock colors	Calvin Lee	2017-02-21
\| \| \| \| \| \| \| \| \| \| \|	Colors are configured through the command line so that swaylock conforms to the i3lock fork 'github.com/chrjguill/i3lock-color'. Differences from it are that one letter options '-r' and '-s' are not implimentend because '-s' is already used by '--scaling' in swaylock. This commit also fixed whitespace in 'include/swaylock/swaylock.h' and changed `parse_color` in 'common/util.h' so that it can accept colors that do not start with a hash. This was done to keep compatability with the i3lock fork.
*	add --no-unlock-indicator to swaylock	Zandr Martin	2016-05-26
\|
*	Change 'display' to 'output' in swaylock docs where necessary	Nuew	2016-03-24
\|
*	Add choice of display to --image.	Nuew	2016-03-24
\| \| \| \| \| \| \| \|	Additionally - Made background colors display when an image is enabled if a --color is specified. - Link CJson to swaylock. - Add the --socket option to swaylock.
*	add a manpage for swaylock	Aaron Ouellette	2016-03-01