forked from opencv/opencv
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Normalize line endings and whitespace
- Loading branch information
OpenCV Buildbot
authored and
Andrey Kamaev
committed
Oct 17, 2012
1 parent
69020da
commit 04384a7
Showing
1,516 changed files
with
261,591 additions
and
260,907 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
.git* export-ignore | ||
|
||
* text=auto | ||
* whitespace=!indent,trail,space | ||
|
||
*.py text whitespace=tab-in-indent,trail,space,fix | ||
*.cpp text whitespace=tab-in-indent,trail,space,fix | ||
*.hpp text whitespace=tab-in-indent,trail,space,fix | ||
*.cxx text whitespace=tab-in-indent,trail,space,fix | ||
*.hxx text whitespace=tab-in-indent,trail,space,fix | ||
*.mm text whitespace=tab-in-indent,trail,space,fix | ||
*.c text whitespace=tab-in-indent,trail,space,fix | ||
*.h text whitespace=tab-in-indent,trail,space,fix | ||
*.i text whitespace=tab-in-indent,trail,space,fix | ||
*.java text whitespace=tab-in-indent,trail,space,fix | ||
*.cu text whitespace=tab-in-indent,trail,space,fix | ||
*.cl text whitespace=tab-in-indent,trail,space,fix | ||
|
||
*.cmake text whitespace=tab-in-indent,trail,space,fix | ||
*.cmakein text whitespace=tab-in-indent,trail,space,fix | ||
*.in text whitespace=tab-in-indent,trail,space,fix | ||
CMakeLists.txt text whitespace=tab-in-indent,trail,space,fix | ||
|
||
*.rst text whitespace=tab-in-indent,trail,space,fix | ||
|
||
*.png binary | ||
*.jepg binary | ||
*.jpg binary | ||
*.exr binary | ||
*.ico binary | ||
|
||
*.a binary | ||
*.so binary | ||
*.dll binary | ||
|
||
*.pdf binary | ||
*.pbxproj binary | ||
*.vec binary | ||
*.doc binary | ||
|
||
*.css_t text | ||
*.qrc text | ||
*.qss text | ||
*.S text | ||
|
||
*.xml -text | ||
*.yml -text | ||
|
||
*.vcproj text eol=crlf merge=union | ||
*.cproject text eol=crlf merge=union | ||
*.bat text eol=crlf | ||
*.cmd text eol=crlf | ||
*.cmd.tmpl text eol=crlf | ||
|
||
*.sh text eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
set(NEW_FFMPEG 1) | ||
set(HAVE_FFMPEG_CODEC 1) | ||
set(HAVE_FFMPEG_FORMAT 1) | ||
set(HAVE_FFMPEG_UTIL 1) | ||
set(HAVE_FFMPEG_SWSCALE 1) | ||
set(HAVE_GENTOO_FFMPEG 1) | ||
|
||
set(ALIASOF_libavcodec_VERSION 53.61.100) | ||
set(ALIASOF_libavformat_VERSION 53.32.100) | ||
set(ALIASOF_libavutil_VERSION 51.35.100) | ||
set(NEW_FFMPEG 1) | ||
set(HAVE_FFMPEG_CODEC 1) | ||
set(HAVE_FFMPEG_FORMAT 1) | ||
set(HAVE_FFMPEG_UTIL 1) | ||
set(HAVE_FFMPEG_SWSCALE 1) | ||
set(HAVE_GENTOO_FFMPEG 1) | ||
|
||
set(ALIASOF_libavcodec_VERSION 53.61.100) | ||
set(ALIASOF_libavformat_VERSION 53.32.100) | ||
set(ALIASOF_libavutil_VERSION 51.35.100) | ||
set(ALIASOF_libswscale_VERSION 2.1.100) |
Oops, something went wrong.