]> source.dussan.org Git - gitignore.git/log
gitignore.git
7 years agoUpdate Java.gitignore
Thien Tran [Thu, 29 Dec 2016 04:24:27 +0000 (11:24 +0700)]
Update Java.gitignore

7 years agoMerge pull request #2217 from XnachO/codeigniter-3.1.2
Brendan Forster [Wed, 21 Dec 2016 03:43:27 +0000 (14:13 +1030)]
Merge pull request #2217 from XnachO/codeigniter-3.1.2

add lines from official codeigniter download

7 years agoDeleted the line corresponding to an OS-specific gitignore file 2217/head
Nacho Seluy [Wed, 21 Dec 2016 03:14:00 +0000 (00:14 -0300)]
Deleted the line corresponding to an OS-specific gitignore file

7 years agoadd lines from official codeigniter download
José I. Seluy [Tue, 20 Dec 2016 11:45:49 +0000 (08:45 -0300)]
add lines from official codeigniter download

- Added lines from the zip of Codeigniter-3.1.2

7 years agoMerge pull request #2215 from TennyZhuang/patch-1
Brendan Forster [Tue, 13 Dec 2016 22:27:22 +0000 (09:27 +1100)]
Merge pull request #2215 from TennyZhuang/patch-1

ignore compile_commands.json

7 years agoignore compile_commands.json 2215/head
庄天翼 [Tue, 13 Dec 2016 17:11:07 +0000 (01:11 +0800)]
ignore compile_commands.json

CMake may generate `compile_commands.json` file with `set(CMAKE_EXPORT_COMPILE_COMMANDS ON)` Option

7 years agoMerge pull request #2212 from github/revert-2211-master
Brendan Forster [Fri, 9 Dec 2016 09:02:13 +0000 (20:02 +1100)]
Merge pull request #2212 from github/revert-2211-master

Revert "添加DS_Store"

7 years agoRevert "添加DS_Store" 2212/head
Brendan Forster [Fri, 9 Dec 2016 09:01:58 +0000 (20:01 +1100)]
Revert "添加DS_Store"

7 years agoMerge pull request #2211 from ligun123/master
Brendan Forster [Fri, 9 Dec 2016 09:01:54 +0000 (20:01 +1100)]
Merge pull request #2211 from ligun123/master

添加DS_Store

7 years agoMerge pull request #2209 from vkusvody/tex.expex
Brendan Forster [Wed, 7 Dec 2016 05:07:10 +0000 (16:07 +1100)]
Merge pull request #2209 from vkusvody/tex.expex

Added pattern for expex forward references

7 years agoAdded pattern for expex forward references 2209/head
Vanya Kapitonov [Tue, 6 Dec 2016 09:48:29 +0000 (20:48 +1100)]
Added pattern for expex forward references

7 years agoMerge pull request #2208 from roubles/master
Brendan Forster [Tue, 6 Dec 2016 09:01:46 +0000 (20:01 +1100)]
Merge pull request #2208 from roubles/master

Existing .gitignore for vim incorrectly matched matched ".swq" through ".swz".

7 years agoExisting .gitignore for vim incorrectly matched matched ".swq" through ".swz". 2208/head
roubles [Tue, 6 Dec 2016 03:38:27 +0000 (22:38 -0500)]
Existing .gitignore for vim incorrectly matched matched ".swq" through ".swz".
While will never be generated by the vim source code.
http://unix.stackexchange.com/questions/326707/vim-what-are-all-the-possible-swapfile-extensions

7 years agoMerge pull request #2207 from sshaw/master
Brendan Forster [Fri, 2 Dec 2016 11:10:49 +0000 (22:10 +1100)]
Merge pull request #2207 from sshaw/master

Add zip and gzip extensions to Perl.gitignore

7 years agoAnnotate some of the Perl entries 2207/head
sshaw [Fri, 2 Dec 2016 02:17:56 +0000 (21:17 -0500)]
Annotate some of the Perl entries

7 years agoAdd zip and gzip extensions to Perl.gitignore
sshaw [Fri, 2 Dec 2016 00:52:48 +0000 (19:52 -0500)]
Add zip and gzip extensions to Perl.gitignore

ExtUtils::MakeMaker based builds can generate .zip and .gz files

7 years agoMerge pull request #2205 from mems/patch-2
Brendan Forster [Wed, 30 Nov 2016 22:49:56 +0000 (09:49 +1100)]
Merge pull request #2205 from mems/patch-2

Add ehthumbs_vista.db as Windows thumbnail cache file

7 years agoMerge pull request #2206 from mattgerstman/master
Brendan Forster [Wed, 30 Nov 2016 22:49:33 +0000 (09:49 +1100)]
Merge pull request #2206 from mattgerstman/master

Standardize comment capitalization in go

7 years agoStandardize comment capitalization 2206/head
Matthew Gerstman [Wed, 30 Nov 2016 13:37:24 +0000 (08:37 -0500)]
Standardize comment capitalization

7 years agoAdd ehthumbs_vista.db as Windows thumbnail cache file 2205/head
Memmie Lenglet [Wed, 30 Nov 2016 12:30:27 +0000 (13:30 +0100)]
Add ehthumbs_vista.db as Windows thumbnail cache file

As Windows Vista Media Center thumbnails

References:

- https://nctritech.wordpress.com/tag/ehthumbs_vista-db/
- https://thumbsviewer.github.io/
- https://www.file-extensions.org/db-file-extension-windows-thumbnail-database

7 years agoMerge pull request #2202 from rolando-contribute/python-wheels-ignore
Brendan Forster [Sun, 27 Nov 2016 20:19:40 +0000 (07:19 +1100)]
Merge pull request #2202 from rolando-contribute/python-wheels-ignore

Ignore wheels directory.

7 years agoMerge pull request #2201 from thomwiggers/tex-endnotes
Brendan Forster [Sun, 27 Nov 2016 20:18:37 +0000 (07:18 +1100)]
Merge pull request #2201 from thomwiggers/tex-endnotes

TeX: ignore endnotes *.ent files

8 years agoIgnore wheels directory. 2202/head
Rolando Espinoza [Sat, 26 Nov 2016 23:46:06 +0000 (20:46 -0300)]
Ignore wheels directory.

As eggs/ directory, wheels directory may contain compiled wheels.

8 years agoTeX: ignore endnotes *.ent files 2201/head
Thom Wiggers [Sat, 26 Nov 2016 15:45:29 +0000 (16:45 +0100)]
TeX: ignore endnotes *.ent files

The `endnotes` package generates `*.ent` files. These should also be
ignored.

8 years agoMerge pull request #2200 from Hastegan/master
Brendan Forster [Fri, 25 Nov 2016 00:57:27 +0000 (11:57 +1100)]
Merge pull request #2200 from Hastegan/master

Symfony: Fix rule for backed up entities

8 years agoMerge pull request #2199 from Alice94/patch-2
Brendan Forster [Fri, 25 Nov 2016 00:57:08 +0000 (11:57 +1100)]
Merge pull request #2199 from Alice94/patch-2

Add missing beamer temporary file extension

8 years agoSymfony: Fix rule for backed up entities 2200/head
hastegan [Thu, 24 Nov 2016 17:55:05 +0000 (18:55 +0100)]
Symfony: Fix rule for backed up entities

8 years agoUpdate TeX.gitignore 2199/head
Alice94 [Thu, 24 Nov 2016 11:14:00 +0000 (12:14 +0100)]
Update TeX.gitignore

Add missing beamer temporary file extension

8 years agoMerge pull request #2194 from davormas/master 2197/head
Brendan Forster [Mon, 21 Nov 2016 13:13:02 +0000 (08:13 -0500)]
Merge pull request #2194 from davormas/master

Modified VS Code .gitignore

8 years agoModified VS Code .gitignore 2194/head
Davor Mas [Mon, 21 Nov 2016 13:04:42 +0000 (14:04 +0100)]
Modified VS Code .gitignore

Added extensions.json as exception in .vscode folder. File is used as
extensions recommendation for project.

8 years agoMerge pull request #2189 from HenrikWM/patch-1
Brendan Forster [Wed, 16 Nov 2016 14:31:17 +0000 (06:31 -0800)]
Merge pull request #2189 from HenrikWM/patch-1

Replace DNX with .NET Core

8 years agoReplace DNX with .NET Core 2189/head
Henrik W. Moe [Wed, 16 Nov 2016 08:52:12 +0000 (09:52 +0100)]
Replace DNX with .NET Core

8 years agoMerge pull request #2187 from Stevoisiak/patch-1
Brendan Forster [Tue, 15 Nov 2016 22:54:00 +0000 (14:54 -0800)]
Merge pull request #2187 from Stevoisiak/patch-1

Ignore *.ctxt in Java.gitignore

8 years agoAdd rule to ignore *.ctxt to Java.gitignore 2187/head
Steven Vascellaro [Tue, 15 Nov 2016 22:32:41 +0000 (17:32 -0500)]
Add rule to ignore *.ctxt to Java.gitignore

.ctxt files are generated automatically each time a project is compiled in BlueJ.

8 years agoMerge pull request #2185 from robinkanters/bower-assets
Brendan Forster [Mon, 14 Nov 2016 18:26:16 +0000 (10:26 -0800)]
Merge pull request #2185 from robinkanters/bower-assets

Removed bower asset exclusion

8 years agoRemoved bower asset exclusion 2185/head
Robin Kanters [Sun, 13 Nov 2016 16:43:00 +0000 (17:43 +0100)]
Removed bower asset exclusion

This is recommended by the Symfony docs:

http://symfony.com/doc/current/frontend/bower.html#should-i-git-ignore-or-commit-bower-assets

8 years agoMerge pull request #2181 from Levityx/master
Brendan Forster [Tue, 8 Nov 2016 17:28:13 +0000 (09:28 -0800)]
Merge pull request #2181 from Levityx/master

Change *.mtc patterns to single *.mtc[0-9]*

8 years agoChange *.mt patterns to single *.mtc[0-9]* 2181/head
Al Levity [Mon, 7 Nov 2016 08:57:00 +0000 (08:57 +0000)]
Change *.mt patterns to single *.mtc[0-9]*

8 years agoMerge pull request #2180 from ChuckFork/master
Brendan Forster [Mon, 7 Nov 2016 03:52:06 +0000 (21:52 -0600)]
Merge pull request #2180 from ChuckFork/master

ignore Properties/launchSettings.json even if Properties is a subfolder

8 years agoignore Properties/launchSettings.json even if Properties is a subfolder 2180/head
ChuckLu [Mon, 7 Nov 2016 03:20:03 +0000 (11:20 +0800)]
ignore Properties/launchSettings.json even if Properties is a subfolder

8 years agoMerge pull request #2130 from JasonGross/patch-1
Brendan Forster [Sun, 6 Nov 2016 23:08:25 +0000 (17:08 -0600)]
Merge pull request #2130 from JasonGross/patch-1

Update Coq.gitignore

8 years agoMerge pull request #2128 from stapelberg/patch-3
Brendan Forster [Sun, 6 Nov 2016 23:07:59 +0000 (17:07 -0600)]
Merge pull request #2128 from stapelberg/patch-3

autotools.gitignore: add missing files

8 years agoMerge pull request #2145 from rkrp/laravel_cache_gitignore
Brendan Forster [Sun, 6 Nov 2016 23:03:50 +0000 (17:03 -0600)]
Merge pull request #2145 from rkrp/laravel_cache_gitignore

Laravel: fixed incorrect ignoring of cache folder

8 years agoMerge pull request #2140 from appleboy/patch-2
Brendan Forster [Sun, 6 Nov 2016 23:02:51 +0000 (17:02 -0600)]
Merge pull request #2140 from appleboy/patch-2

Ignore Passport-generated OAuth keys

8 years agoMerge pull request #2132 from rpowelll/patch-1
Brendan Forster [Sun, 6 Nov 2016 23:02:33 +0000 (17:02 -0600)]
Merge pull request #2132 from rpowelll/patch-1

Update Elixir.gitignore

8 years agoMerge pull request #2134 from morrislaptop/patch-1
Brendan Forster [Sun, 6 Nov 2016 23:02:11 +0000 (17:02 -0600)]
Merge pull request #2134 from morrislaptop/patch-1

Add yarn ignored file

8 years agoMerge pull request #2155 from troyp/master
Brendan Forster [Sun, 6 Nov 2016 23:00:27 +0000 (17:00 -0600)]
Merge pull request #2155 from troyp/master

elisp: add emacs backup files and undo-tree save-history files

8 years agoMerge pull request #2165 from ArgentiApparatus/patch-3
Brendan Forster [Sun, 6 Nov 2016 22:49:45 +0000 (14:49 -0800)]
Merge pull request #2165 from ArgentiApparatus/patch-3

Update to take into account Dart SDK 1.20

8 years agoMerge pull request #1768 from thomaseizinger/patch-1
Brendan Forster [Sun, 6 Nov 2016 22:47:50 +0000 (14:47 -0800)]
Merge pull request #1768 from thomaseizinger/patch-1

Add rule to unignore the maven wrapper jar

8 years agoMerge pull request #2146 from linterpreteur/patch-1
Brendan Forster [Sun, 6 Nov 2016 22:45:29 +0000 (14:45 -0800)]
Merge pull request #2146 from linterpreteur/patch-1

[Android] Add .idea/tasks.xml

8 years agoMerge pull request #2159 from exarus/patch-1
Brendan Forster [Sun, 6 Nov 2016 22:44:37 +0000 (14:44 -0800)]
Merge pull request #2159 from exarus/patch-1

Updated Jetbrains.gitignore

8 years agoMerge pull request #2172 from dkav/del-python
Brendan Forster [Sun, 6 Nov 2016 22:34:18 +0000 (14:34 -0800)]
Merge pull request #2172 from dkav/del-python

Delete IPythonNotebook.gitignore

8 years agoMerge pull request #2173 from robsonpeixoto/patch-3
Brendan Forster [Sun, 6 Nov 2016 22:30:26 +0000 (14:30 -0800)]
Merge pull request #2173 from robsonpeixoto/patch-3

Add .dir-locals.el

8 years agoAdd .dir-locals.el 2173/head
Robson Roberto Souza Peixoto [Fri, 4 Nov 2016 12:57:41 +0000 (09:57 -0300)]
Add .dir-locals.el

Read more here: https://www.gnu.org/software/emacs/manual/html_node/emacs/Directory-Variables.html

8 years agoDelete IPythonNotebook.gitignore 2172/head
Darren [Fri, 4 Nov 2016 04:30:40 +0000 (21:30 -0700)]
Delete IPythonNotebook.gitignore

The IPython Notebook is now known as the Jupyter Notebook (see http://ipython.org/notebook.html). Jupyter ignore values are already found in the Python.gitignore.

8 years agoMerge pull request #2166 from jvcdk/master 2175/head
Brendan Forster [Thu, 3 Nov 2016 13:47:46 +0000 (06:47 -0700)]
Merge pull request #2166 from jvcdk/master

Update of Visual Studio gitignore file.

8 years agoMerge pull request #2170 from lucasgautheron/master
Brendan Forster [Thu, 3 Nov 2016 13:45:50 +0000 (06:45 -0700)]
Merge pull request #2170 from lucasgautheron/master

TeX: feynMF/feynMP

8 years agoTeX: feynMF/feynMP 2170/head
Lucas Gautheron [Thu, 3 Nov 2016 09:32:51 +0000 (10:32 +0100)]
TeX: feynMF/feynMP

8 years agoMerge pull request #2168 from calben/patch-1
Brendan Forster [Wed, 2 Nov 2016 18:23:45 +0000 (11:23 -0700)]
Merge pull request #2168 from calben/patch-1

add the *.VC.db to unreal engine ignore

8 years agoadd the *.VC.db to unreal engine ignore 2168/head
Calem Bendell [Wed, 2 Nov 2016 15:48:05 +0000 (11:48 -0400)]
add the *.VC.db to unreal engine ignore

as of visual studio 2015 update 2 this file stores the intellisense database.
this file is typically huge and shouldn't be included in a repository.

8 years agoAdded reference to get latest from GitHub. 2166/head
Jørn Christensen [Wed, 2 Nov 2016 12:29:53 +0000 (13:29 +0100)]
Added reference to get latest from GitHub.

If the .gitignore file is inlcuded in another project, it may be feasible to have a reference to origin.

8 years agoAdded C++ project filter file.
Jørn Christensen [Wed, 2 Nov 2016 12:27:57 +0000 (13:27 +0100)]
Added C++ project filter file.

Reference: http://stackoverflow.com/questions/1826901/should-i-add-vcxproj-filter-files-to-source-control

8 years agoUpdate to take into account Dart SDK 1.20 2165/head
Gary Smith [Tue, 1 Nov 2016 11:50:48 +0000 (07:50 -0400)]
Update to take into account Dart SDK 1.20

Dart SDK 1.20 no longer creates `packages` directories. Added comments to `pub` files section to differentiate  what is needed for >= SDK 1.20 and what is additionally needed for older SDK versions.

8 years agoUpdated Jetbrains.gitignore 2159/head
Ruslan Gunawardana [Sat, 29 Oct 2016 05:16:09 +0000 (08:16 +0300)]
Updated Jetbrains.gitignore

Added datasource folder

8 years agoMerge pull request #2158 from github/cc-0-license-text 2164/head
Brendan Forster [Fri, 28 Oct 2016 18:02:49 +0000 (11:02 -0700)]
Merge pull request #2158 from github/cc-0-license-text

Use the exact CC-0 license text

8 years agoUse the exact CC-0 license text 2158/head
Ben Balter [Fri, 28 Oct 2016 15:18:45 +0000 (11:18 -0400)]
Use the exact CC-0 license text

8 years agoMerge pull request #2156 from mattayes/jupyter-notebooks
Brendan Forster [Wed, 26 Oct 2016 21:31:40 +0000 (08:31 +1100)]
Merge pull request #2156 from mattayes/jupyter-notebooks

Rename 'IPython Notebook' comment to 'Jupyter Notebook'

8 years agoRename 'IPython Notebook' comment to 'Jupyter Notebook' 2156/head
Matt Braymer-Hayes [Wed, 26 Oct 2016 19:48:53 +0000 (12:48 -0700)]
Rename 'IPython Notebook' comment to 'Jupyter Notebook'

8 years agoadd final newline 2155/head
Troy Pracy [Wed, 26 Oct 2016 16:19:31 +0000 (03:19 +1100)]
add final newline

8 years agoadd undo-tree save-files
Troy Pracy [Wed, 26 Oct 2016 16:16:42 +0000 (03:16 +1100)]
add undo-tree save-files

8 years agoadd backup files (*~)
Troy Pracy [Wed, 26 Oct 2016 16:15:56 +0000 (03:15 +1100)]
add backup files (*~)

8 years agoMerge pull request #2150 from ddfreyne/nanoc-fix
Brendan Forster [Sun, 23 Oct 2016 23:44:51 +0000 (10:14 +1030)]
Merge pull request #2150 from ddfreyne/nanoc-fix

Nanoc: Fix capitalisation + config filename

8 years agoMerge pull request #2151 from israelroldan/patch-1
Brendan Forster [Sun, 23 Oct 2016 23:43:57 +0000 (10:13 +1030)]
Merge pull request #2151 from israelroldan/patch-1

Update ExtJs.gitignore

8 years agoUpdate ExtJs.gitignore 2151/head
Israel Roldan [Sun, 23 Oct 2016 14:58:30 +0000 (16:58 +0200)]
Update ExtJs.gitignore

8 years agoNanoc: Mention nanoc.yaml rather than config.yaml 2150/head
Denis Defreyne [Sun, 23 Oct 2016 13:05:29 +0000 (15:05 +0200)]
Nanoc: Mention nanoc.yaml rather than config.yaml

8 years agoNanoc: Improve grammar
Denis Defreyne [Sun, 23 Oct 2016 13:04:39 +0000 (15:04 +0200)]
Nanoc: Improve grammar

8 years agoNanoc: Fix capitalisation of Nanoc
Denis Defreyne [Sun, 23 Oct 2016 13:03:16 +0000 (15:03 +0200)]
Nanoc: Fix capitalisation of Nanoc

8 years agoAdd .idea/tasks.xml 2146/head
Wooseop Kim [Sat, 22 Oct 2016 03:05:13 +0000 (12:05 +0900)]
Add .idea/tasks.xml

Please refer to [the official guide](https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems).

8 years agolaravel: fixed incorrect ignoring of cache folder 2145/head
Krishna Ram Prakash R [Fri, 21 Oct 2016 08:51:09 +0000 (14:21 +0530)]
laravel: fixed incorrect ignoring of cache folder

8 years agoMerge pull request #2143 from mrs-mrl/patch-1
Brendan Forster [Wed, 19 Oct 2016 22:07:20 +0000 (09:07 +1100)]
Merge pull request #2143 from mrs-mrl/patch-1

ignore Visual Studio 6 workspace file

8 years agoignore Visual Studio 6 workspace file 2143/head
mrs-mrl [Wed, 19 Oct 2016 11:24:44 +0000 (13:24 +0200)]
ignore Visual Studio 6 workspace file

see e.g.
http://stackoverflow.com/a/1530193
https://msdn.microsoft.com/en-us/library/aa241721(v=vs.60).aspx

8 years agoMerge pull request #2141 from jasongaylord/master
Brendan Forster [Tue, 18 Oct 2016 21:53:16 +0000 (08:53 +1100)]
Merge pull request #2141 from jasongaylord/master

Removed LaunchSettings.json from being committed

8 years agoRemoved LaunchSettings.json from being committed 2141/head
Jason N. Gaylord [Mon, 17 Oct 2016 22:49:23 +0000 (18:49 -0400)]
Removed LaunchSettings.json from being committed

8 years agoIgnore Passport-generated OAuth keys 2140/head
Bo-Yi Wu [Mon, 17 Oct 2016 09:24:02 +0000 (17:24 +0800)]
Ignore Passport-generated OAuth keys

8 years agoMerge pull request #2139 from appleboy/patch-1
Brendan Forster [Mon, 17 Oct 2016 07:39:12 +0000 (18:39 +1100)]
Merge pull request #2139 from appleboy/patch-1

ignore public/storage for laravel 5

8 years agoignore public/storage for laravel 5 2139/head
Bo-Yi Wu [Mon, 17 Oct 2016 05:48:16 +0000 (13:48 +0800)]
ignore public/storage for laravel 5

Ref: https://github.com/laravel/laravel/blob/master/.gitignore#L2

8 years agoMerge pull request #2137 from dvlprs/update/Opencart
Brendan Forster [Sat, 15 Oct 2016 22:44:20 +0000 (09:44 +1100)]
Merge pull request #2137 from dvlprs/update/Opencart

Update/opencart

8 years agoexcluding vqmod cache files and logs 2137/head
dvlprs [Sat, 15 Oct 2016 11:44:22 +0000 (11:44 +0000)]
excluding vqmod cache files and logs

8 years agoexcluding vqmod cache files and logs
root [Sat, 15 Oct 2016 11:41:12 +0000 (11:41 +0000)]
excluding vqmod cache files and logs

8 years agoAdd yarn ignored file 2134/head
Craig Morris [Wed, 12 Oct 2016 13:07:57 +0000 (14:07 +0100)]
Add yarn ignored file

8 years agoUpdate Elixir.gitignore 2132/head
Rhys Powell [Wed, 12 Oct 2016 00:36:46 +0000 (11:36 +1100)]
Update Elixir.gitignore

This should really ignore compiled .beam files as well

8 years agoAdd mllib, mlpack files 2130/head
Jason Gross [Tue, 11 Oct 2016 21:25:39 +0000 (17:25 -0400)]
Add mllib, mlpack files

8 years agoAdd .native
Jason Gross [Tue, 11 Oct 2016 21:21:20 +0000 (17:21 -0400)]
Add .native

8 years agoUpdate Coq.gitignore
Jason Gross [Tue, 11 Oct 2016 21:18:40 +0000 (17:18 -0400)]
Update Coq.gitignore

Add various files that show up when you run tactics (the *.cache in 8.4 and 8.5, .*.cache in 8.6), build plugins (the various OCaml files), and for the native compiler of Coq 8.5.

8 years agoautotools.gitignore: add missing files 2128/head
Michael Stapelberg [Tue, 11 Oct 2016 07:39:26 +0000 (09:39 +0200)]
autotools.gitignore: add missing files

See the full list of scripts documented in AC_CONFIG_AUX_DIR in https://www.gnu.org/software/automake/manual/html_node/Optional.html

8 years agoMerge pull request #2093 from Leandros/patch-1
Brendan Forster [Tue, 4 Oct 2016 23:30:07 +0000 (10:30 +1100)]
Merge pull request #2093 from Leandros/patch-1

Extend C to ignore Visual Studio artifacts

8 years agoMerge branch 'master' into HEAD 2093/head
Arvid Gerstmann [Tue, 4 Oct 2016 09:04:00 +0000 (11:04 +0200)]
Merge branch 'master' into HEAD

8 years agoMerge pull request #2096 from petermorlion/jetbrains-include-shared-settings
Brendan Forster [Mon, 3 Oct 2016 03:48:42 +0000 (14:48 +1100)]
Merge pull request #2096 from petermorlion/jetbrains-include-shared-settings

Include shared settings, according to official docs

8 years agoAdd rustfmt gitignore (#2108)
Wayne Nilsen [Mon, 3 Oct 2016 03:46:39 +0000 (23:46 -0400)]
Add rustfmt gitignore (#2108)

8 years agoMerge pull request #2115 from aarian93p/patch-1
Brendan Forster [Mon, 3 Oct 2016 03:45:32 +0000 (14:45 +1100)]
Merge pull request #2115 from aarian93p/patch-1

Added kernel module compilation results