diff options
| author | Perry Hung <iperry@gmail.com> | 2011-02-18 05:22:39 -0500 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-02-26 22:30:22 -0500 |
| commit | f4cdcfa51096f73a49642c400681d91847137dfb (patch) | |
| tree | b49bcffdd58fc4dbedceafe55c92045e4b3e145c /.gitignore | |
| parent | b505ab981859761a9eae9e820c5a06e2210c5dfc (diff) | |
| download | librambutan-f4cdcfa51096f73a49642c400681d91847137dfb.tar.gz librambutan-f4cdcfa51096f73a49642c400681d91847137dfb.zip | |
checkpoint
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,10 +1,13 @@ build/ docs/build/ -main.cpp libmaple.layout tags TAGS *~ *.swp docs/doxygen/ +<<<<<<< Updated upstream arm +======= +notes/ +>>>>>>> Stashed changes |