X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=0ac20c91e0fce90f67caa5d7f07d0739215d094c;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=82596253fe8ee103b8d153a70eeb3a9377c1c69f;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp index 8259625..0ac20c9 100644 --- a/source/buildinfo.cpp +++ b/source/buildinfo.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include #include "buildinfo.h" @@ -30,7 +23,7 @@ void unique(StringList &l) } -void BuildInfo::add(const BuildInfo &bi) +void BuildInfo::update_from(const BuildInfo &bi) { cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end()); defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());