Merge "Upgrade jQuery to 1.8.1 now that the remaining bug fixes have been merged"

[lhc/web/wiklou.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d4db084..ff3ced3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,43 @@
+# Repository management
 .svn
+
+# Editors
+*.kate-swp
 *~
-.classpath
-.idea
-.metadata*
+.*.swp
 .project
-.settings
-AdminSettings.php
-LocalSettings.php
-StartProfiler.php
 cscope.files
 cscope.out
-favicon.ico
+## NetBeans
 nbproject*
 project.index
+
+# MediaWiki install & usage
+cache
+images/[0-9a-f]
+images/archive
+images/deleted
+images/temp
+images/thumb
+## Extension:EasyTimeline
+images/timeline
+images/tmp
+maintenance/.mweval_history
+maintenance/.mwsql_history
+maintenance/dev/data
+AdminSettings.php
+LocalSettings.php
+StartProfiler.php
+
+# Operating systems
+## Mac OS X
+.DS_Store
+
+# Misc
+.classpath
+.idea
+.metadata*
+.settings
+favicon.ico
 static*
 tags