-
Sebastien Granjoux authored
Conflicts: configure.ac plugins/gbf-am/gbf-am-parse.in plugins/gbf-am/gbf-am-project.c plugins/gbf-mkfile/gbf-mkfile-project.c
18e0b499
Conflicts: configure.ac plugins/gbf-am/gbf-am-parse.in plugins/gbf-am/gbf-am-project.c plugins/gbf-mkfile/gbf-mkfile-project.c