From 8bd9e43cd5ae3ee33b9eb58ef5ea362643103793 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Sun, 2 Aug 2015 20:35:45 -0500
Subject: [PATCH] Added a .gitignore file to ignore the local build folder, and
 a few other project related files that don't need to be checked in.

---
 .bzrignore | 1 +
 .gitignore | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 .gitignore

diff --git a/.bzrignore b/.bzrignore
index a5a4351f..e7f24925 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,4 @@ build/*
 *.DS_Store
 .pydevproject
 .settings
+.idea/*
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e7f24925
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+build/
+build/*
+*.DS_Store
+.pydevproject
+.settings
+.idea/*
\ No newline at end of file