updates to merge

pingdynasty · Jun 14, 2014 · e4e0431 · e4e0431
1 parent cc61e52
commit e4e0431
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,3 @@
 *.d
 *.~
 gdbscript
-
-Build/*
-Libraries/STM32F4-Discovery_FW_V1.1.0
-Tools/gcc-arm-none-eabi*
-Tools/dfu-util/
-Tools/stlink/
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Libraries/OwlPatches"]
 	path = Libraries/OwlPatches
 	url = git@github.com:pingdynasty/OwlPatches.git
-    ignore = dirty
+	ignore = dirty