diff options
author | willakat <willakat@users.noreply.github.com> | 2017-01-07 21:33:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-07 21:33:02 +0100 |
commit | 653e96f530325f76c2e63befd1f4e916a08c770f (patch) | |
tree | 16ae997cc181c0960861e4549b697fa35aed647e /CONTRIBUTING.md | |
parent | Added mouse resize for auto layouts (diff) | |
parent | MIT license (diff) | |
download | sway-653e96f530325f76c2e63befd1f4e916a08c770f.tar.gz sway-653e96f530325f76c2e63befd1f4e916a08c770f.tar.zst sway-653e96f530325f76c2e63befd1f4e916a08c770f.zip |
Merge branch 'master' into master
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc9079e9..aa3a632b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -71,7 +71,7 @@ message as well. | |||
71 | ## Coding Style | 71 | ## Coding Style |
72 | 72 | ||
73 | Sway is written in C. The style guidelines is [kernel | 73 | Sway is written in C. The style guidelines is [kernel |
74 | style](https://www.kernel.org/doc/Documentation/CodingStyle), but all braces go | 74 | style](https://www.kernel.org/doc/Documentation/process/coding-style.rst), but all braces go |
75 | on the same line (*"but K&R says so!" is a silly way of justifying something*). | 75 | on the same line (*"but K&R says so!" is a silly way of justifying something*). |
76 | Some points to note: | 76 | Some points to note: |
77 | 77 | ||