rune/gitignore
1
0
Fork 0
Code Pull Requests Activity
1,668 Commits 8 Branches 0 Tags 11 MiB
e0df63986a
Commit Graph

332 Commits

Author SHA1 Message Date
Carl Suster
eda2ee70de Merge pull request #990 from chiragsanghavi/master 
Remove duplicate line in Global/webMethods template
 2014-03-08 11:02:37 +11:00
chirag sanghavi
9280c7e331 removed duplicate 2014-03-07 17:27:59 -05:00
ssinss
b3b6865ad3 Update JetBrains.gitignore 2014-03-07 00:10:38 +09:00
Carl Suster
69b99dd091 Merge pull request #963 from tioui/eiffelstudio 
Adding a global template for EiffelStudio
 2014-02-28 23:26:00 +11:00
Carl Suster
121cbc3b73 Merge pull request #945 from arcresu/sass-cache 
Simplify sass cache rules
 2014-02-28 23:21:39 +11:00
Dennis Xiloj
13c119f167 Added ignore for directory config under KDE 
Dolphin, the KDE file manager, writes specific directory configuration in .directory files.
 2014-02-28 00:26:43 -06:00
Louis M
009b474870 Move the EiffelStudio.gitignore in the Global directory 2014-02-27 21:41:28 -05:00
Carl Suster
503bde5d24 Merge Sass and Compass templates 2014-02-21 10:39:43 +11:00
jturmel
9a0f32a452 Remove AndroidStudio, modify Global/JetBrains 
* Remove AndroidStudio.gitignore in favor of adding the
  change needed to the Global/JetBrains.gitignore file
 2014-02-12 10:40:56 -06:00
Christoph Emmersberger
38cbefd1c4 Update JetBrains.gitignore 
Add plugin file description for JIRA config file containing username and password
 2014-02-06 19:00:54 +01:00
Adam Roben
5979282c55 Merge pull request #912 from stuartpb/patch-1 
Update Cloud9.gitignore
 2014-01-06 19:53:53 -08:00
Stuart P. Bentley
446ba8454d Update Cloud9.gitignore 
The next version of Cloud9 will use a top-level .c9 folder in the workspace for settings and metadata.
 2014-01-02 16:51:35 -08:00
Arinto Murdopo
791e8ed0ae Add output directory of sbteclipse plugin, 
which is ".target" directory.
 2013-12-25 07:48:34 +08:00
Adam Roben
43c205b5df Merge pull request #862 from jaseemabid/emacs 
Ignore elpa and eshell generated files
 2013-11-26 19:56:16 -08:00
Adam Roben
cea67aabe0 Merge pull request #853 from danieljabailey/master 
Add Lazarus IDE ignore file (in global dir this time)
 2013-11-26 19:50:24 -08:00
Adam Roben
926389c7cc Merge pull request #849 from Danimoth/patch-1 
Change Eclipse.gitignore to correctly handle bin/ and tmp/ directories
 2013-11-26 19:48:19 -08:00
Adam Roben
51a1221f50 Merge pull request #835 from ggirou/master 
Move editor specific files into a new DartEditor.gitignore
 2013-11-26 19:37:23 -08:00
Adam Roben
ddef3121c6 Merge pull request #728 from zyrx/master 
DW Dreamweaver added files
 2013-11-26 19:32:13 -08:00
Jaseem Abid
207cddf155 Ignore elpa and eshell generated files 2013-11-14 11:00:49 +05:30
Justin Spahr-Summers
f0f5e38db2 Merge pull request #760 2013-11-13 14:19:22 -08:00
Justin Spahr-Summers
4a7ab06382 Remove generic and Java ignore patterns 
Those belong in other ignore files.
 2013-11-13 14:19:16 -08:00
unknown
e57da65843 Moved file to Global 2013-11-13 15:19:36 -05:00
Daniel Bailey
27569799cb Added lazarus ignore file in the global dir this time 2013-11-13 18:33:14 +00:00
Alexander Karatarakis
3ade853604 Update Eclipse.gitignore 2013-11-13 03:14:12 +02:00
Adam Roben
af405251f0 Merge pull request #730 from Lazersmoke/patch-1 
Added Kate ignore file in Global folder
 2013-11-12 08:11:17 -08:00
Adam Roben
de877c3e23 Merge pull request #681 from filipelenfers/master 
Ensime ignores
 2013-11-12 08:07:58 -08:00
Adam Roben
fc73773a74 Merge pull request #645 from pxqr/master 
Ignore emacs flymake-mode temp files.
 2013-11-12 08:04:57 -08:00
Adam Roben
b04b8b24aa Merge pull request #561 from stuartpb/cloud9 
Add Cloud9 gitignore
 2013-11-12 07:51:08 -08:00
Adam Roben
4dd9d7376d Merge pull request #591 from mjgardner/master 
fixing pattern for compiled elisp
 2013-11-12 07:42:54 -08:00
Ivan Yatskevich
94a2b3b668 add .idea_modules/ to Global/JetBrains.gitignore 2013-11-12 14:38:34 +03:00
Adam Roben
a1e656a093 Merge pull request #443 from bungeshea/BricxCC 
Added Bricx Command Center gitignore
 2013-11-11 11:31:13 -08:00
Shea Bunge
9345b6b461 Add comment to BricxCC.gitignore 2013-11-12 06:28:53 +11:00
Shea Bunge
8cbac43dab Move BricxCC.gitignore to Global directory 2013-11-12 06:27:39 +11:00
Adam Roben
2fea1b6b92 Merge pull request #831 from arcresu/idea 
Consolidate various IDE tempates into Global/JetBrains template
 2013-11-11 05:25:58 -08:00
Adam Roben
9463c86d9b Merge pull request #424 from MichaelMBishop/master 
added NotepadPP.gitignore for Notepad++
 2013-11-11 05:15:35 -08:00
Guillaume Girou
12d95d1ff8 Move editor specific files into a new DartEditor.gitignore 2013-11-10 17:28:41 +01:00
Carl Suster
9ae01d0b64 Rename template IDEA->JetBrains 2013-11-09 08:14:41 +11:00
Carl Suster
af886f72c8 Add back out/ for IntelliJ under IDEA 2013-11-09 08:04:35 +11:00
Carl Suster
af9ec6115c Add .idea/tasks.xmk to IDEA ignore suggections 2013-11-09 07:36:40 +11:00
Carl Suster
fcf0a9ccab Remove individual JetBrains IDE templates in favour of IDEA template 2013-11-09 07:28:12 +11:00
Carl Suster
aa00e7f210 Add an IDEA template to cover all related IDEs 2013-11-09 07:28:12 +11:00
Carl Suster
3dadf4e9b3 Make sublime-project rule off by default 2013-11-09 06:37:52 +11:00
Carl Suster
024d6e83fc Add comment to prevent *.sublime-project being ignored. 
Based on advice in the documentation at
http://www.sublimetext.com/docs/2/projects.html
 2013-11-09 06:37:52 +11:00
Adam Roben
684a4fe44b Merge pull request #805 from Utumno/patch-1 
.classpath and .project files are *meant to be versioned*
 2013-11-07 19:44:43 -08:00
Carl Suster
db625a1012 Merge pull request #643 from stationkeeping/patch-1 
Fixed SASS case (It's Sass, not SASS)
 2013-11-06 15:30:32 -08:00
Adam Roben
49d7fbfc8c Merge pull request #821 from healsdata/master 
Create an ignore file for Vagrant's configuration and internal files.
 2013-11-06 06:03:17 -08:00
Jonathan Campbell
c1af2ae829 Allow the Vagrantfile to be tracked as that's the intended purpose. 
From the documentation at http://docs.vagrantup.com/v2/getting-started/project_setup.html

"The Vagrantfile is meant to be committed to version control with your project, if you use version control. This way, every person working with that project can benefit from Vagrant without any upfront work."
 2013-11-05 22:41:37 -05:00
Justin Spahr-Summers
7e4feaf658 Merge pull request #315 from torbjoernk/global_add_kdevelop 
adding global gitignore for KDevelop4
 2013-11-05 11:23:52 -08:00
Adam Roben
1099dea39f Merge pull request #300 from pangratz/add_texlipse 
Add .texlipse for the TeXlipse Latex plugin for Eclipse
 2013-11-05 09:03:04 -08:00
Adam Roben
7ff92c890a Merge pull request #820 from harshadsabne/master 
Add .gradle to Eclipse.gitignore
 2013-11-05 08:39:37 -08:00
Stefan Schlott
02aa9eb7a8 Ignore cache and history (created by SBT >=0.12) 2013-11-05 07:36:32 +01:00
Martín Blech
464ae2642b Ignoring [._]*.sw[a-p] instead of *.s[a-w][a-z] 
The old pattern was too broad and was making VIM ignore Scheme (*.scm) files.
Now it only matches files that start with . or _.
 2013-11-04 11:31:51 -03:00
Adam Roben
8480473de9 Merge pull request #804 from rutice/osx 
Fix OSX-specific Icon\r rule
 2013-11-04 05:44:51 -08:00
Adam Roben
43f3bb3952 Merge pull request #751 from nysa/master 
Vim: Ignore .*.s[a-w][a-z] and .s[a-w][a-z] swap files
 2013-11-04 05:38:40 -08:00
Adam Roben
50ee7b7156 Merge pull request #810 from mildis/master 
add Windows Installer files
 2013-11-04 05:33:24 -08:00
Adam Roben
12b76696da Merge pull request #699 from Bengt/includism 
Includism: Remove `.*`
 2013-11-04 05:26:16 -08:00
Adam Roben
8b68687361 Merge pull request #370 from bdsatish/master 
gtags (GNU global) and cscope ignore files.
 2013-11-04 05:16:16 -08:00
Adam Roben
7c5547dc20 Merge pull request #378 from agassi/patch-1 
Add out folder to gitignore
 2013-11-04 05:10:11 -08:00
Jonathan Campbell
5343cb30b2 Create an ignore file for Vagrant's configuration and internal files. 
Documented at http://docs.vagrantup.com/v2/getting-started/project_setup.html

These files are created automatically the first time a vagrant box is started.
 2013-11-03 00:43:07 -04:00
Harshad Sabne
5e2de71777 Add .gradle 2013-10-31 01:03:56 +05:30
mildis
59c668120f add Windows Installer files 2013-10-16 18:45:13 +02:00
mildis
d15f0b17fc add Windows Installer files 2013-10-16 18:39:24 +02:00
Utumno
5627d20401 .classpath and .project files are *meant to be versioned* 
As is clearly stated in the [eclipse documentation](http://wiki.eclipse.org/FAQ_How_do_I_set_up_a_Java_project_to_share_in_a_repository%3F).  
This gitignore has lead to much confusion in SO - please ammend

I would guess the same is true for .pydevproject and .cproject but can't
be sure/do not have any references on those

Also .launch configurations are generally meant to be versioned when
saved under project location. See for instance :
http://stackoverflow.com/a/337317/281545
 2013-10-12 22:28:01 +03:00
Daisuke Goto
da36175ff6 Fix OSX-specific Icon\r rule 2013-10-12 19:14:17 +09:00
Ivan Zuzak
f0dde55c6b ensure single trailing newline 2013-10-06 14:40:01 +02:00
Nysa
c98c138ee1 Vim: Forgot to change *.s[a-w][a-z] to .*.s[a-w][a-z] 2013-08-27 21:04:19 -05:00
Nysa
0030e9df60 Vim: Ignore .*.s[a-w][a-z] and .s[a-w][a-z] swap files 
.*.s[a-w][a-z] matches named swap files.
.s[a-w][a-z] matches unnamed swap files.
 2013-08-27 20:51:55 -05:00
Sam Quinn
5f35f30b04 Added Kate ignore file 
ignores .<filename>.kate-swp and (older version?) .swp.<filename>
see http://bit.ly/14XyBgW and http://bit.ly/chKUoZ
 2013-08-04 22:25:21 -05:00
Lech H. Conde
c83782755f DW Dreamweaver added files 
A lot of web designers still uses DW, thats why its necessary.
 2013-07-31 12:56:24 -05:00
Bengt Lüers
a6c76a5308 There is no need to unignore .gitignore. 
Because files and directories starting with a `.` are not ignored in general.
 2013-07-05 01:06:35 +02:00
Bengt Lüers
ad1289f0d9 Files and directories starting with a . should not be ignored in general. 2013-07-05 01:06:35 +02:00
Filipe Pais Lenfers
c173b00b32 Add Ensime specific ignores 2013-06-13 16:35:13 -03:00
Sam T
ae0d13d31c Ignore emacs flymake-mode temp files. 2013-05-10 01:35:12 +04:00
stationkeeping
923acecd29 Fixed SASS case (It's Sass, not SASS) 2013-05-09 09:50:44 +02:00
Mark Gardner
cd5b0112a4 Emacs gitignore gitignore mode because recursion 2013-03-19 16:43:04 -04:00
Mark Gardner
2d8461d42c actually ignore compiled elisp with pattern 2013-03-19 16:17:11 -04:00
Nysa
acce99efee Ignore Vim untitled and unsaved buffer swapfiles 
Vim creates buffer swapfiles starting at .swp for buffers that are
active but untitled and unsaved.
 2013-03-06 11:02:36 -06:00
Stuart P. Bentley
39d25ad962 Add Cloud9 gitignore 2013-02-17 21:28:52 -08:00
Justin Spahr-Summers
eaa2ad526f Merge pull request #474 from zhaojunmeng/master 
Add *~ to ignore vim temp file.
 2013-01-22 13:39:30 -08:00
Matt Burke
0e38a13ffb Merge pull request #514 from bristol/vim-swapfile-fix 
Changed line matching vim swapfiles to use all names it will create
 2013-01-22 12:08:37 -08:00
andy bristol
c6bcfb1bd4 Changed line matching vim swapfiles to use all names it will create as described in http://vimdoc.sourceforge.net/htmldoc/recover.html#E326 2013-01-21 20:10:16 -05:00
Haacked
ec5009e954 Move VisualStudio file from Global to main list 2012-12-19 15:28:41 -08:00
amalrik
044043f559 change the line endings of Global/OSX from dos to unix format 2012-11-22 21:33:12 -02:00
zhaojunmeng
3c54c0d7aa Add *~ to ignore vim temp file. 2012-11-14 22:26:04 +08:00
Jared Koumentis
8200f76973 Merge pull request #341 from x3ro/fix-sublime 
The sublime-project file should be checked into version control
 2012-10-05 15:15:59 -07:00
Jean-Bernard Ratté
187c9cd399 VritualEnv specific files generated automaticaly when a new Env is created 2012-09-30 11:51:29 -04:00
Jean-Bernard Ratté
e295e20fa2 PyCharm IDE project specific files 2012-09-30 11:47:35 -04:00
Michael Metcalf Bishop
33567b0374 Added NotepadPP.gitignore for Notepad++ 
.bak extension for backup files
 2012-08-31 17:52:51 -05: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
Coby Chapple
f78c09ffd2 Manual merge to close #305 2012-08-24 16:43:07 +10:00
Coby Chapple
4f958411c1 Merge pull request #303 from safwanc/matlab-mex 
Ignoring compiled MEX binaries for all platforms
 2012-08-23 23:39:41 -07:00
Jonas Trevisan
174c45e796 Added .AppleDouble to OSX 2012-08-22 13:38:50 -03:00
Justin Spahr-Summers
e732aa40a1 Merge pull request #348 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 #334 from mkenyon/master 
Add OSX-specific Icon\r rule
 2012-08-09 00:09:51 -07:00
Coby Chapple
b2818653f6 Merge pull request #360 from svanschu/master 
PHPStorm gitignore
 2012-08-08 18:26:38 -07:00
Coby Chapple
5a860949c0 Remove space after Thumbs.db — fixes #355 2012-08-08 17:37:15 +10:00
Coby Chapple
52398081c6 Merge pull request #395 from hugocf/patch-1 
Windows XP Media Center Edition also creates ehthumbs.db
 2012-08-02 19:51:19 -07:00
Coby Chapple
55f8c12acc Merge pull request #385 from gneatgeek/master 
Updated SASS gitignore
 2012-08-02 19:29:02 -07:00
Justin Spahr-Summers
f88aa40dbe Merge pull request #361 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 #304 from mgold/master 
.netrwhist
 2012-08-02 19:03:41 -07:00
Hugo Ferreira
0be0dd05f7 Windows XP Media Center Edition also creates ehthumbs.db which holds previews of video files. 
See http://en.wikipedia.org/wiki/Windows_thumbnail_cache#Thumbs.db
 2012-07-17 01:17:08 +02:00
GneatGeek
027e033836 Updated SASS gitignore 2012-07-03 13:54:50 -07:00
sciencebrainrs
dc623d479d Add out folder to gitignore 2012-06-23 17:19:47 -05:00
Satish BD
e741ca37c8 Ignores for gtags and cscope added. 2012-06-10 01:32:00 +03:00
Max Nanasy
91a1756d29 Removed redundant ".directory" that was already covered by ".*". 2012-06-04 14:51:20 -07:00
Sven Schultschik
c27430e74c PhPStorm gitignore 2012-06-04 22:59:05 +02:00
Björn Esser
4eebde9c47 added rule for .bz2 --> bzip2 2012-05-19 12:02:40 +02:00
Lucas Jenss
21f9741a1f The sublime-project file should be checked into version control 
It contains project specific configuration, and should therefore by
checked into version control (as documented on
http://www.sublimetext.com/docs/2/projects.html)
 2012-05-10 15:25:42 +02:00
Mike Kenyon
720975f849 Add OSX-specific Icon\r rule 2012-05-01 15:02:46 -07:00
Dana
4b6bf65bdf Updated Global/VisualStudio.gitignore 2012-04-30 10:52:47 -07:00
Torbjörn Klatt
e6aa7144b2 adding global gitignore for KDevelop4 
KDevelop4 is the C/C++-IDE from the KDE desktop.
It creates a directory '.kdev4' and a hidden file
<projectname>.kdev4 in the project's root directory.
 2012-04-20 10:12:43 +02:00
Max Goldstein
5bb2255b69 Include .netrwhist, the user's history and potential privacy concern. See: http://stackoverflow.com/questions/9850360/ 2012-04-19 00:46:16 -03:00
Safwan Choudhury
dfb30c6409 Ignoring compiled MEX binaries for all platforms 
Including mexglx, mexa64, mexmaci64, mexw32 & mex64 (see
http://sfwn.in/FxbE for official list from Mathworks).
 2012-04-18 23:15:10 -04:00
pangratz
4ef43d6b40 Add .texlipse for the TeXlipse Latex plugin for Eclipse 
This addresses #229
 2012-04-19 02:53:26 +02:00
Paul Betts
f7acf5b08f Merge pull request #252 from EugeneKay/master 
Global/Windows: Recycle Bins on network shares
 2012-04-18 14:41:08 -07:00
Chris Wanstrath
ffe0448a4c Merge pull request #287 from ogier/xilinx-ise 
Added Xilinx ISE gitignore
 2012-04-18 11:57:04 -07:00
Chris Wanstrath
a3ca100987 Merge pull request #288 from adilmughal/patch-1 
Update Global/VisualStudio.gitignore
 2012-04-18 11:56:45 -07:00
Chris Wanstrath
cf9c028deb Merge pull request #214 from dtrebbien/patch-1 
VisualStudio.gitignore: Ignore the ‘x64’ directories
 2012-04-18 11:49:26 -07:00
Chris Wanstrath
0393836093 Merge pull request #260 from gneatgeek/master 
SASS ignore File
 2012-04-18 11:47:31 -07:00
Chris Wanstrath
4cede2e9d5 Merge pull request #266 from joshminnie/master 
Bumpy case StyleCop file wasn't being ignored
 2012-04-18 11:47:03 -07:00
Chris Wanstrath
72835feb15 Merge pull request #268 from jrhorn424/emacs-org-mode 
Added Org-mode section to Emacs ignore file
 2012-04-18 11:46:11 -07:00
Chris Wanstrath
c483d6fdd3 Merge pull request #285 from philipproplesch/master 
Added NuGet "packages" directory and some NCrunch files to the VisualStudio.gitignore
 2012-04-18 11:43:25 -07:00
GneatGeek
8cc0784302 Merge remote-tracking branch 'upstream/master' 2012-04-15 00:04:01 -07:00
Matheus dos Santos Lima
67d649e153 add '.sublime-workspace' in Global/SublimeText.gitignore 2012-04-12 17:48:45 -03:00
Adil Mughal
c7ff9c5c75 Update Global/VisualStudio.gitignore 2012-04-10 23:01:00 +06:00
Alex Ogier
26921c039a Added Xilinx ISE gitignore 2012-04-09 21:21:28 -04:00
Philip Proplesch
5872a72579 Added NuGet and NCrunch to VisualStudio.gitignore 2012-04-03 12:38:46 +02:00
Jeffrey Horn
c0d30d5869 Added Org-mode section to Emacs ignore file 
Org-mode stores archived TODOs from todo.org into todo.org_archive. It also
creates .org-id-locations in some cases.
 2012-03-08 19:12:55 -05:00
Joshua Minnie
5b2876071d StyleCop file was sometimes bumpy case 2012-03-08 15:53:34 -05:00
GneatGeek
bd20a55b30 Added SASS ignore file. 2012-02-20 15:56:24 -08:00
Eugene E. Kashpureff Jr
3aa2b49364 Add Recycle Bin on file shares 2012-02-02 11:39:55 -06:00
Daniel Trebbien
24372f9c4a VisualStudio.gitignore: Ignore the ‘x64’ directories 2011-11-06 09:16:21 -05:00
John Barker
a48d4a9d14 tags on it's own will match a directory like lib/tags/ 2011-09-14 14:29:04 +08:00
Chris Wanstrath
74b5ce5612 Merge pull request #183 from x3ro/master 
Remove weird OS X specific .gitignore rule which behaves very unexpectedly
 2011-09-01 16:59:13 -07:00
Chris Wanstrath
c0827ef922 Merge pull request #192 from stuartdb/patch-1 
Installshield project output folder.
 2011-09-01 16:57:09 -07:00
Chris Wanstrath
5039b28ea3 Merge pull request #169 from x3ro/patch-2 
Improve NetBeans .gitignore rules
 2011-09-01 16:56:32 -07:00
Chris Wanstrath
c08b5eaf4a Merge pull request #163 from mibe/master 
Some C# / VS changes
 2011-09-01 16:55:11 -07:00
Chris Wanstrath
d9fb955d92 Merge pull request #161 from cboutter/master 
Added a newline at end of the Mercurial and Java files in order to build a gitignore file from multiple templates.
 2011-09-01 16:54:30 -07:00
Chris Wanstrath
64ef3e4f00 Merge pull request #134 from sjaeckel/master 
Altera Quartus II and Mentor Graphics ModelSim/Questa
 2011-09-01 16:43:21 -07:00
Chris Wanstrath
dee4333885 Merge pull request #153 from ovargas27/master 
Added RubyMine
 2011-09-01 16:37:51 -07:00
Chris Wanstrath
084249a945 Merge pull request #154 from onecrayon/master 
Added support for Espresso .gitignore
 2011-09-01 16:37:39 -07:00
Chris Wanstrath
1aa3d1d58e Merge pull request #155 from elyscape/patch-1 
Added .sln.docstates to ignore list
 2011-09-01 16:37:25 -07:00
Chris Wanstrath
518ec11a41 Merge pull request #158 from jbolduan/master 
Added Support For MonoDevelop .gitignore
 2011-09-01 16:36:11 -07:00
Chris Wanstrath
2d038fd682 Merge pull request #160 from the-kenny/master 
Ignore Emacs write-lock files
 2011-09-01 16:35:27 -07:00
Chris Wanstrath
9fa55481d6 Merge pull request #167 from audioplastic/master 
Added Matlab.gitignore to Globals
 2011-09-01 16:34:48 -07:00
Chris Wanstrath
c61fcfd6d5 Merge pull request #173 from DenisGorbachev/patch-1 
Edited Global/Eclipse.gitignore via GitHub
 2011-09-01 16:34:41 -07:00
Chris Wanstrath
4644c35447 Merge pull request #178 from jasoncawood/master 
added SublimeText ignore
 2011-09-01 16:34:19 -07:00
Chris Wanstrath
1fad2cd7b1 Merge pull request #187 from bripkens/master 
Ignore additional Netbeans configuration file
 2011-09-01 16:34:10 -07:00