mpv/.gitignore

*.o
*.a
*.d
.depend

/config.h
/config.mak
/config.log
/mplayer
/version.h
/codecs.conf.h
/codec-cfg
/cpuinfo
/tags
/TAGS
/locale
/po
/libvo/vo_gl3_shaders.h
/libmpdemux/ebml_defs.c
/libmpdemux/ebml_types.h
/libvo/vdpau_template.c
Add .gitignore files 2008-04-27 01:59:37 +00:00			`*.o`
			`*.a`
			`*.d`
			`.depend`

			`/config.h`
			`/config.mak`
build: Rename configure.log file to config.log git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31415 b3059339-0415-0410-9bf9-f77b7e298cf2 2010-06-14 15:17:48 +00:00			`/config.log`
Add .gitignore files 2008-04-27 01:59:37 +00:00			`/mplayer`
			`/version.h`
			`/codecs.conf.h`
			`/codec-cfg`
.gitignore: add /cpuinfo Ignore the "cpuinfo" binary. The configure script can create that on systems which lack /proc/cpuinfo or equivalent. 2011-03-13 20:20:51 +00:00			`/cpuinfo`
.gitignore: add /tags, /TAGS Ignore index files from ctags/etags. Remove obsolete entries for ffmpeg and mencoder. 2010-11-13 08:52:19 +00:00			`/tags`
			`/TAGS`
.gitignore: add /po and /locale 2011-02-15 19:28:57 +00:00			`/locale`
.gitignore: add /cpuinfo Ignore the "cpuinfo" binary. The configure script can create that on systems which lack /proc/cpuinfo or equivalent. 2011-03-13 20:20:51 +00:00			`/po`
Merge remote-tracking branch 'origin/master' Conflicts: .gitignore bstr.c cfg-mplayer.h defaultopts.c libvo/video_out.c The conflict in bstr.c is due to uau adding a bstr_getline function in commit 2ba8b91a97e7e8. This function already existed in this branch. While uau's function is obviously derived from mine, it's incompatible. His function preserves line breaks, while mine strips them. Add a bstr_strip_linebreaks function, fix all other uses of bstr_getline, and pick uau's implementation. In .gitignore, change vo_gl3_shaders.h to use an absolute path additional to resolving the merge conflict. 2012-07-28 15:07:49 +00:00			`/libvo/vo_gl3_shaders.h`
build: use python3 to generate some files previously in git Some files used during build are generated with Python scripts in TOOLS/. Before, the generated files were included in the git tree. Start creating them at build time. This introduces a build-dependency on python3. The files in question are: libvo/vdpau_template.c libmpdemux/ebml_types.h libmpdemux/ebml_defs.c 2012-07-01 23:09:03 +00:00			`/libmpdemux/ebml_defs.c`
			`/libmpdemux/ebml_types.h`
			`/libvo/vdpau_template.c`