Changeset ebe26af for src/sql


Ignore:
Timestamp:
01/11/17 21:35:17 (5 years ago)
Author:
gregor herrmann <gregoa@…>
Branches:
master, qt5
Children:
809b5e5
Parents:
54b69e2 (diff), 4a87a3b (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

Location:
src/sql
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/sql/schedulexmlparser.cpp

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

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

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

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