From: Kevin Lamonte <kevin.lamonte@gmail.com>
Date: Sun, 22 Dec 2019 12:22:03 +0000 (+0000)
Subject: Merge branch 'ignore_intellij_files' into 'master'
X-Git-Tag: fanfix-3.0.1^2~4^2~3
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=74c53307b022746dadc4ae211ea98d616d0a4af9;hp=21460f442b7b21d02c6f80290acd901d9c5a8a0b;p=fanfix.git

Merge branch 'ignore_intellij_files' into 'master'

Ignore Intellij files and directories.

See merge request klamonte/jexer!26
---

diff --git a/.gitignore b/.gitignore
index 30d9f7c..2779ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,7 @@ examples/*.sh
 
 # Fonts for testing
 fonts/**
+
+.idea/**
+*.iml
+*.ipr