1
0
Commit Graph

466 Commits

Author SHA1 Message Date
Stanislaw Swierc
0bcb4f258c Added Windows Store app package directory 2012-10-01 10:05:17 +01:00
Ted Nyman
c1cac76c73 Update README to detail best pull request style 2012-09-23 14:31:30 -07:00
Ted Nyman
64cc236103 Merge pull request from nateabele/patch-1
The Lithium app should be the root repo folder
2012-09-10 15:00:48 -07:00
Ted Nyman
9a95caff33 Merge pull request from Baztoune/master
Added Play 2.0 working directories
2012-09-10 14:55:29 -07:00
Nate Abele
a5d6516f13 The Lithium app should be the root repo folder 2012-09-01 19:10:36 -03:00
Justin Spahr-Summers
c61686f988 Merge remote-tracking branch 'exalted/master' 2012-08-27 09:21:32 -07:00
Ali Servet Donmez
964de38e9b Merge branch 'master' of https://github.com/github/gitignore
Conflicts:
	Global/OSX.gitignore
2012-08-27 12:40:37 +02:00
Ali Servet Donmez
54928f53d7 Seems like this should go into OSX.gitignore instead. 2012-08-27 12:38:11 +02:00
Justin Spahr-Summers
f1cb24b9c2 Merge remote-tracking branch 'stig/patch-1'
Conflicts:
	Objective-C.gitignore
2012-08-27 03:29:25 -07:00
Coby Chapple
f78c09ffd2 Manual merge to close 2012-08-24 16:43:07 +10:00
Coby Chapple
4f958411c1 Merge pull request from safwanc/matlab-mex
Ignoring compiled MEX binaries for all platforms
2012-08-23 23:39:41 -07:00
Coby Chapple
75da0e1af2 Merge pull request from jonhkr/patch-1
Added .AppleDouble to OSX
2012-08-23 23:38:56 -07:00
Coby Chapple
25a1e617c4 Merge pull request from vanniksoftware/master
Appcelerator Titanium .gitignore file
2012-08-23 23:36:53 -07:00
Mike Nikles
a1ef23350d Added Appcelerator Titanium .gitignore file. 2012-08-22 18:06:15 -07:00
Jonas Trevisan
174c45e796 Added .AppleDouble to OSX 2012-08-22 13:38:50 -03:00
Ali Servet Donmez
d08fbbd0d4 Merge branch 'master' of https://github.com/github/gitignore 2012-08-22 12:22:38 +02:00
Coby Chapple
c160ad912a Merge pull request from honzajavorek/patch-1
Added missing whitespaces in comments
2012-08-19 17:13:52 -07:00
Honza Javorek
2f7bc6bab3 added missing whitespaces in comments 2012-08-18 19:55:23 +03:00
Coby Chapple
76dd79a51f Merge pull request from ecarreras/master
Adding PyDev files to .gitignore
2012-08-09 20:45:01 -07:00
Coby Chapple
d14aab9a64 Merge pull request from AArnott/patch-1
Adds .vspx and .log files to exclude for C#/VB
2012-08-09 20:43:59 -07:00
Justin Spahr-Summers
e732aa40a1 Merge pull request from bjoern-esser/master
ignore bz2 files, which are bzip2 actually
2012-08-09 00:10:14 -07:00
Justin Spahr-Summers
fa954f291e Merge pull request from mkenyon/master
Add OSX-specific Icon\r rule
2012-08-09 00:09:51 -07:00
Justin Spahr-Summers
f453a04cb4 Merge pull request from yrashk/patch-1
Don't ignore priv directory in Erlang projects
2012-08-09 00:03:25 -07:00
Coby Chapple
b2818653f6 Merge pull request from svanschu/master
PHPStorm gitignore
2012-08-08 18:26:38 -07:00
Andrew Arnott
de7a7117c7 Added .vspx and .log to .gitignore for VB 2012-08-08 16:36:34 -07:00
Andrew Arnott
6073319fb1 Added .gitignore entries for .vspx and .log 2012-08-08 16:33:51 -07:00
Eduard Carreras
2661a82010 Adding pydev files 2012-08-08 19:57:13 +03:00
Coby Chapple
5a860949c0 Remove space after Thumbs.db — fixes 2012-08-08 17:37:15 +10:00
Ali Servet Donmez
6f6c2eac58 Add .LSOverride 2012-08-03 12:41:27 +02:00
Coby Chapple
fcb11295b5 Merge pull request from lmjabreu/patch-2
Added file exclusions, reformatted
2012-08-02 20:02:12 -07:00
Coby Chapple
52398081c6 Merge pull request from hugocf/patch-1
Windows XP Media Center Edition also creates ehthumbs.db
2012-08-02 19:51:19 -07:00
Coby Chapple
54769b4048 Merge pull request from NameFILIP/patch-1
Update SeamGen.gitignore
2012-08-02 19:49:00 -07:00
Coby Chapple
bc0c761efc Merge pull request from bfuk/patch-2
Added ignore of W3TC cache folder (for users that might be using W3TC ca...
2012-08-02 19:48:21 -07:00
Coby Chapple
9b566a37ad Merge pull request from rb2/master
Fix Opencart gitignore
2012-08-02 19:45:14 -07:00
Coby Chapple
f43d17eed0 Merge pull request from thenew/patch-1
add *.log (wp-content/debug.log)
2012-08-02 19:39:30 -07:00
Coby Chapple
55f8c12acc Merge pull request from gneatgeek/master
Updated SASS gitignore
2012-08-02 19:29:02 -07:00
Coby Chapple
67083ce70d Make CakePHP ignore config folder of either case
This takes the change from  and makes it case insensitive so that CakePHP projects from both before and after the rename ignore the appropriate files.
2012-08-03 12:18:45 +10:00
Justin Spahr-Summers
f88aa40dbe Merge pull request from MaxNanasy/patch-1
Removed redundant ".directory" that was already covered by ".*".
2012-08-02 19:05:26 -07:00
Justin Spahr-Summers
e31878f8bc Merge pull request from mgold/master
.netrwhist
2012-08-02 19:03:41 -07:00
Justin Spahr-Summers
fae236e74a Merge remote-tracking branch 'arsenm/patch-1'
Conflicts:
	C.gitignore
2012-08-02 19:03:14 -07:00
Justin Spahr-Summers
8486f22049 Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts:
	Objective-C.gitignore
2012-08-02 19:02:06 -07:00
Coby Chapple
4709f02b41 Merge pull request from ntotten/master
Added Windows Azure build output files
2012-08-02 18:54:56 -07:00
Justin Spahr-Summers
ef2db78680 Merge pull request from rhysd/master
ignoring *.dylib (dynamic link libraries in MacOS X)
2012-08-02 18:53:21 -07:00
Justin Spahr-Summers
edaff200ff Merge pull request from osteslag/patch-1
Update to also ignore .DS_Store files
2012-08-02 18:53:03 -07:00
Coby Chapple
9f41394164 Merge pull request from AD7six/patch-1
the current version of Cakephp (2.x) renamed the config folder to Config
2012-08-02 18:50:42 -07:00
Nathan Totten
1a2c40923c Added NuGet packages directory 2012-08-02 14:40:30 -07:00
Nathan Totten
d9d85d8a24 Added Windows Azure build output files 2012-08-02 14:37:34 -07:00
Ruslan Brest
ac71c8886d fix Opencart gitignore 2012-08-01 10:56:28 +03:00
Filip Spiridonov
e2c0408fb6 Update SeamGen.gitignore 2012-07-31 11:57:21 +08:00
bfuk
9da936706c Added ignore of W3TC cache folder (for users that might be using W3TC cache plugin) 2012-07-24 11:41:47 +02:00