a464ad68b1
the conflict was already marked, but these two files were in the wrong PLIST. ok pascal@ (MAINTAINER) sthen@ |
||
---|---|---|
.. | ||
4.2 | ||
4.6 | ||
4.7 | ||
DESCR | ||
DESCR-ada | ||
DESCR-c++ | ||
DESCR-estdc | ||
DESCR-f95 | ||
DESCR-g77 | ||
DESCR-go | ||
DESCR-java | ||
DESCR-objc | ||
Makefile | ||
Makefile.inc |