From f4cdcfa51096f73a49642c400681d91847137dfb Mon Sep 17 00:00:00 2001 From: Perry Hung Date: Fri, 18 Feb 2011 05:22:39 -0500 Subject: checkpoint --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 7e29a09..be8bc38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ build/ docs/build/ -main.cpp libmaple.layout tags TAGS *~ *.swp docs/doxygen/ +<<<<<<< Updated upstream arm +======= +notes/ +>>>>>>> Stashed changes -- cgit v1.2.3