summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo k <mo@mokhan.ca>2012-05-11 17:08:00 -0600
committermo k <mo@mokhan.ca>2012-05-11 17:08:00 -0600
commit17d527dcf8fd6bd743f59b13fec96e7087ae8575 (patch)
treeeebe2056479f7415bad0ff8fccb2509c56294484
parent2ec5d90b32f256650967f525b0b8ae5fb5f72c8b (diff)
parent104e3d842725c4e167a1a42d165f8ddbd232aa50 (diff)
Merge branch 'master' of github.com:mokhan/irobot
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1d6672b..f52fc34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.swp
*.suo
*.user
+_Resharper*