Fixed merge problems
authorptools <ptools>
Tue, 15 Jun 2004 07:32:36 +0000 (07:32 +0000)
committerptools <ptools>
Tue, 15 Jun 2004 07:32:36 +0000 (07:32 +0000)
commitcb6beb975950121f0569c5dede6136fb8ae0b8b8
tree3e786c93b35c440e413cbc1193fbaac7c7567031
parent2c3b0bab9fb135c23d320880196ad3c0c20a5537
Fixed merge problems
144 files changed:
001
002
003
004
005
005.out
006
007
008
009
010
010.out
011
012
013
014
014.out
015
016
017
018
020
022
022.out [deleted file]
023
023.out [deleted file]
024
025
025.out
026
027
027.out
028
028.out
029
030
030.out [deleted file]
031
031.out [deleted file]
032
033
033.out [deleted file]
034
035
036
036.out [deleted file]
037
038
039
039.out [deleted file]
042
043
043.out [deleted file]
044
045
046
047
047.out
048
049
050
051
052
053
054
055
055.out [deleted file]
056
057
058
059
060
061
061.out
062
063
064
064.out
065
066
067
068
069
070
071
071.out
072
073
074
074.out
075
076
077
078
079
080
081
082
083
084
086
087
088
089
Makefile
common
common.attr
common.config
common.filter
common.log
common.rc
configure.in
include/Makefile
include/builddefs.in
include/buildmacros
lib/databin.c
lib/tlibio.c
lib/write_log.c
ltp/Makefile
ltp/doio.c
ltp/fsstress.c
ltp/fsx.c
ltp/growfiles.c
ltp/iogen.c
ltp/rwtest.sh
m4/package_gdbmdev.m4
m4/package_utilies.m4
src/acl_test.c
src/alloc.c
src/bstat.c
src/dbtest.c
src/devzero.c
src/dirstress.c
src/fault.c
src/feature.c
src/fill2.c
src/fstest.c
src/global.h
src/godown.c
src/lstat64.c
src/randholes.c
src/runas.c
src/truncfile.c
src/xfsctl.c