diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:58:41 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-07-22 19:58:41 +0200 |
commit | ef724a37cdb3012efb5b7233eb8b450ad91d3d69 (patch) | |
tree | 2334455220f417223cc1a75aebe76302cdffdf5a /.gitignore | |
parent | 6f276c2517990f6569b961b4d4919cbce570ac45 (diff) | |
parent | 47e5dcdf349a1aea5c8997104ef785412f0d34fa (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
elf/rtld.c
misc/syslog.c
sysdeps/gnu/configure
sysdeps/gnu/configure.in
sysdeps/mach/hurd/accept4.c
sysdeps/mach/hurd/bits/posix_opt.h
sysdeps/mach/hurd/dup3.c
sysdeps/mach/hurd/i386/init-first.c
sysdeps/mach/hurd/kernel-features.h
sysdeps/mach/hurd/readlinkat.c
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fbdcf54506..98f00f3e3c 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,7 @@ TODO.html autom4te*.cache -rtkaio +/linuxthreads +/linuxthreads_db +/ports +/rtkaio |