From f78c09ffd22421ba6de22975140934a07e2d9a48 Mon Sep 17 00:00:00 2001
From: Coby Chapple <coby@github.com>
Date: Fri, 24 Aug 2012 16:43:07 +1000
Subject: [PATCH] Manual merge to close #305

---
 Global/Matlab.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
index 20843f21..f52813b6 100644
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -11,3 +11,6 @@
 
 # Compiled MEX binaries (all platforms)
 *.mex*
+
+# Simulink Code Generation	
+slprj/