diff options
| author | Perry Hung <iperry@alum.mit.edu> | 2010-03-30 22:03:00 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@alum.mit.edu> | 2010-03-30 22:03:00 -0400 |
| commit | 2c33d55bae8f9e0e009634072ab05302fc734a65 (patch) | |
| tree | 63285f96e795fc423cd5bf573340d12f6c8d5513 /.gitignore | |
| parent | 23149e9706ff0a6a338e13804456dff4c655e34b (diff) | |
| parent | 1d3861ef93f8423176c6010ab606abdab00a7cbd (diff) | |
| download | librambutan-2c33d55bae8f9e0e009634072ab05302fc734a65.tar.gz librambutan-2c33d55bae8f9e0e009634072ab05302fc734a65.zip | |
Merge branch 'master' into rcc-dev
Conflicts:
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c6a72b4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build/ +main.cpp |