commit 99ac266d22aa934287a8cde13da0f2c104da91d7
parent 8de94d87c3b3340501adc24fb47424727e565115
Author: Raymond Li <hi@raymond.li>
Date: Sun, 14 Feb 2021 15:20:24 -0500
Merge branch 'master' into pr/197
Diffstat:
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -24,7 +24,7 @@ For other kinds of issues, you can remove this section, or add any aditional inf
## Environment
Output of `i3lock --version`:
<pre>
-i3lock version:
+i3lock version:
</pre>
Where'd you get i3lock-color from?
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,7 +4,7 @@
Closes #[issue number]
## Description
- -
+ -
### Screenshots/screencaps
<!--
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -48,7 +48,7 @@ jobs:
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
+ # By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
diff --git a/blur.c b/blur.c
@@ -147,4 +147,3 @@ void blur_impl_horizontal_pass_generic(uint32_t *src, uint32_t *dst, int width,
}
}
}
-
diff --git a/blur.h b/blur.h
@@ -14,5 +14,3 @@ void blur_impl_horizontal_pass_sse2(uint32_t *src, uint32_t *dst, int width, int
#endif
void blur_impl_horizontal_pass_generic(uint32_t *src, uint32_t *dst, int width, int height);
#endif
-
-
