Ignore:
Timestamp:
08/30/17 20:38:27 (5 years ago)
Author:
gregor herrmann <gregor@…>
Branches:
master, qt5
Children:
79a7671
Parents:
ebe26af (diff), e27a3f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into qt5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/app/application.h

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