Remove conflict marker.
[official-gcc.git] / libgfortran / 
treeb30002c37b8797523533da854228ed9cc7221e02
drwxr-xr-x   ..
-rw-r--r-- 15 .cvsignore
-rw-r--r-- 131417 ChangeLog
-rw-r--r-- 17764 Makefile.am
-rw-r--r-- 163048 Makefile.in
-rw-r--r-- 10019 acinclude.m4
-rw-r--r-- 23053 aclocal.m4
-rw-r--r-- 8153 c99_protos.h
-rw-r--r-- 12109 config.h.in
-rwxr-xr-x 616112 configure
-rw-r--r-- 19346 configure.ac
-rw-r--r-- 538 fmain.c
drwxr-xr-x - generated
drwxr-xr-x - intrinsics
drwxr-xr-x - io
-rw-r--r-- 17826 libgfortran.h
-rw-r--r-- 252 libtool-version
drwxr-xr-x - m4
-rwxr-xr-x 1742 mk-kinds-h.sh
-rwxr-xr-x 583 mk-sik-inc.sh
-rwxr-xr-x 603 mk-srk-inc.sh
drwxr-xr-x - runtime