diff options
| author | Johnathan Corgan | 2009-10-11 08:42:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-11 08:42:37 -0700 |
| commit | c49fc2debfbcbf6e8ab2100f7d20319b457792ee (patch) | |
| tree | 8995da495bcd10e51842ada61fb62cf69c51b2e3 /.gitattributes | |
| parent | a1faa30ce3313e81e180792bea445fe0a961fe3c (diff) | |
| parent | 58f84719a2084142bd2fe008a7ff4b1f05b5a598 (diff) | |
| download | gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.tar.gz gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.tar.bz2 gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.zip | |
Merge branch 'patches/dward' of git@gnuradio.org:jcorgan
* 'patches/dward' of git@gnuradio.org:jcorgan:
#include "config.h" in db_wbxng.cc (for timespec, nanosleep, etc.)
Add flags and dependencies for MinGW/MSYS.
Add dependence of gruel on guile; fixes ticket #410.
Use gruel::mutex instead of pthread_mutex in gr_histo_sink_f.
Add .gitattributes to fix CRLF problems on MinGW/MSYS
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..49a0e1424 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# The following turn off LF->CRLF conversion for some files on Windows. +# these conversions cause syntax errors on MinGW/MSYS. They should not +# have any effect on non-Windows systems or on Cygwin. Any files that +# required svn:eof-style=lf under subversion should be included here. +# +*.m4 -crlf +*.ac -crlf +*.scm -crlf |