Skip to content

Commit

Permalink
Merge commit 'origin/master' into fedora/master
Browse files Browse the repository at this point in the history
Conflicts:
	ChangeLog
	sysdeps/unix/sysv/linux/i386/sysconf.c
	sysdeps/x86_64/cacheinfo.c
	version.h
  • Loading branch information
Andreas Schwab committed Jun 10, 2009
2 parents dfbbe67 + 88ea382 commit 0d02cb1
Show file tree
Hide file tree
Showing 275 changed files with 6,121 additions and 4,008 deletions.
29 changes: 0 additions & 29 deletions .cvsignore

This file was deleted.

46 changes: 46 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
*~
*.d
*.o
*.so
*.po
*.go
*.bo
stamp.*
*.stamp
*.ustamp
*.udeps
*.gz
*.Z
*.tar
*.tgz
*.bz2
=*
TODO
AUTHORS
copyr-*
copying.*
glibc-*

configparms

ieeetest
regex

gpl2lgpl.sed
distinfo

test-include
analysis
docs
releases

libc.prj
.libc.prcs_aux
libc.proj
.snprj

TODO.html

autom4te*.cache

rtkaio
Loading

0 comments on commit 0d02cb1

Please sign in to comment.