diff options
| author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
| commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
| tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /.gitignore | |
| parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
| parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
| download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip | |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 6a6326509..b333709ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,30 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +.* +*.o +*.a +*.ko +*.so +*.la +*.lo +*.py[oc] +*.gz +*.patch +*~ +\#*# +.deps +.libs +TAGS +*-stamp +!.gitignore +make.log /configure /Makefile.in /config.log @@ -17,5 +44,3 @@ /compile /build /run_tests.sh -/*-stamp -*~ |