diff options
author | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
---|---|---|
committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
commit | 0d02cb10e8dd8639b86450cf8e597cf5e2e09894 (patch) | |
tree | 0f2174db43a501b946f0600d1b91ae4117977b04 /manual | |
parent | dfbbe67270efa9c03f9444d50d2f98a7a64622b4 (diff) | |
parent | 88ea382fda5af7717f85bb19837c9c99094f3df4 (diff) |
Merge commit 'origin/master' into fedora/master
Conflicts:
ChangeLog
sysdeps/unix/sysv/linux/i386/sysconf.c
sysdeps/x86_64/cacheinfo.c
version.h
Diffstat (limited to 'manual')
-rw-r--r-- | manual/.cvsignore | 14 | ||||
-rw-r--r-- | manual/.gitignore | 29 | ||||
-rw-r--r-- | manual/charset.texi | 2 |
3 files changed, 30 insertions, 15 deletions
diff --git a/manual/.cvsignore b/manual/.cvsignore deleted file mode 100644 index 54abbbb5a4..0000000000 --- a/manual/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz *.bz2 -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* - -*.dvi* *.info* *.c.texi *.ps *.pdf -*.toc *.aux *.log *.tmp -*.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs - -texis top-menu.texi chapters.texi summary.texi stamp-* -distinfo dir-add.texinfo dir-add.texi - -libm-err.texi diff --git a/manual/.gitignore b/manual/.gitignore new file mode 100644 index 0000000000..e92cef39b4 --- /dev/null +++ b/manual/.gitignore @@ -0,0 +1,29 @@ +*.aux +*.c.texi +*.cp +*.cps +*.dvi* +*.fn +*.fns +*.info* +*.ky +*.kys +*.log +*.pdf +*.pg +*.pgs +*.ps +*.tmp +*.toc +*.tp +*.tps +*.vr +*.vrs +chapters.texi +dir-add.texi +dir-add.texinfo +libm-err.texi +stamp-* +summary.texi +texis +top-menu.texi diff --git a/manual/charset.texi b/manual/charset.texi index 8b2c09ca79..79854e50bf 100644 --- a/manual/charset.texi +++ b/manual/charset.texi @@ -1234,7 +1234,7 @@ file_mbsrtowcs (int input, int output) /* @r{If any characters must be carried forward,} @r{put them at the beginning of @code{buffer}.} */ if (filled > 0) - memmove (inp, buffer, filled); + memmove (buffer, inp, filled); @} return 1; |