Changeset 54b69e2 for src/app


Ignore:
Timestamp:
01/13/15 23:27:16 (7 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
ebe26af
Parents:
4b6ae6b
Message:

Merged changes from trunk. It still compiles successfully. :-)

Location:
src/app
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/app/application.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/application.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/appsettings.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/appsettings.h

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
  • src/app/main.cpp

    r4b6ae6b r54b69e2  
    11/*
    22 * Copyright (C) 2010 Ixonos Plc.
    3  * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
     3 * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
    44 *
    55 * This file is part of ConfClerk.
Note: See TracChangeset for help on using the changeset viewer.