Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/tools/common/kFileFormatBase.cpp

    r8003 r21916  
    3030 * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
    3131 */
    32 kFileFormatBase::kFileFormatBase(kFile *pFile)
     32kFileFormatBase::kFileFormatBase(kFile *pFile) throw (kError)
    3333    : pFile(pFile)
    3434{
    … …  
    4242 * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
    4343 */
    44 kFileFormatBase::~kFileFormatBase()
     44kFileFormatBase::~kFileFormatBase() throw (kError)
    4545{
    4646    if (pFile)
Note: See TracChangeset for help on using the changeset viewer.