OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict marker

Browse Source 
From-SVN: r242871
This commit is contained in:
Eric Botcazou 2016-11-25 10:04:20 +00:00
parent d8cc3d06f8
commit 4741b062d6
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -139,7 +139,6 @@
PR target/67822
* config/nvptx/mkoffload.c (main): Allow -fopenmp.
>>>>>>> .r242853
2016-11-24 Eric Botcazou <ebotcazou@adacore.com>
* common/config/sparc/sparc-common.c (sparc_option_optimization_table):