Changeset ebe26af in confclerk_git


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

Files:
67 edited

Legend:

Unmodified
Added
Removed

  • README

    r54b69e2 rebe26af  
    2525
    2626  Copyright (C) 2010 Ixonos Plc.
    27   Copyright (C) 2011-2014, Philipp Spitzer, gregor herrmann, Stefan Strahl
     27  Copyright (C) 2011-2015, Philipp Spitzer, gregor herrmann, Stefan Strahl
    2828
    2929  This program is free software; you can redistribute it and/or modify

  • confclerk.pro

    r54b69e2 rebe26af  
    1717changelog.target = ChangeLog
    1818changelog.commands = \
    19         svn up && svn2cl --group-by-day --reparagraph
     19        git pull && /usr/share/gnulib/build-aux/gitlog-to-changelog > ChangeLog
    2020changelog.CONFIG = phony
    2121
    … …  
    4343                $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \
    4444                $${TARGET}-$${VERSION}/Makefile ; \
    45         tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
     45        tar -cz --exclude=.svn --exclude=.git --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \
    4646        $(DEL_FILE) -r $${TARGET}-$${VERSION}
    4747tarball.depends = changelog icon man

  • data/confclerk.pod

    r54b69e2 rebe26af  
    6666
    6767    Copyright (C) 2010 Ixonos Plc.
    68     Copyright (C) 2011-2014, Philipp Spitzer <philipp@toastfreeware.priv.at>
    69     Copyright (C) 2011-2014, gregor herrmann <gregor@toastfreeware.priv.at>
    70     Copyright (C) 2011-2014, Stefan Strahl <stefan@toastfreeware.priv.at>
     68    Copyright (C) 2011-2015, Philipp Spitzer <philipp@toastfreeware.priv.at>
     69    Copyright (C) 2011-2015, gregor herrmann <gregor@toastfreeware.priv.at>
     70    Copyright (C) 2011-2015, Stefan Strahl <stefan@toastfreeware.priv.at>
    7171
    7272    This program is free software; you can redistribute it and/or modify

  • src/alarm/alarm.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/alarm/alarm.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/app/application.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/app/application.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/app/appsettings.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/app/appsettings.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/app/main.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/gui/about.ui

    r54b69e2 rebe26af  
    138138&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ConfClerk is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version.&lt;/p&gt;
    139139&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ConfClerk is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.&lt;/p&gt;
    140 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2014 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     140&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2015 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    141141         </property>
    142142         <property name="textFormat">

  • src/gui/conferenceeditor.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/gui/conferenceeditor.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/gui/conflictdialogcontainer.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/gui/conflictdialogcontainer.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/gui/conflictsdialog.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/gui/conflictsdialog.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/gui/daynavigatorwidget.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/gui/daynavigatorwidget.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/gui/dayviewtabcontainer.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/gui/dayviewtabcontainer.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/gui/errormessage.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/gui/errormessage.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/gui/eventdialog.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/gui/eventdialog.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/gui/favtabcontainer.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/gui/favtabcontainer.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/gui/mainwindow.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/gui/mainwindow.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/gui/roomstabcontainer.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/gui/roomstabcontainer.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/gui/searchhead.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/gui/searchhead.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/gui/searchtabcontainer.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/gui/searchtabcontainer.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/gui/settingsdialog.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/gui/settingsdialog.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/gui/tabcontainer.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/gui/tabcontainer.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/gui/trackstabcontainer.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/gui/trackstabcontainer.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/gui/urlinputdialog.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/gui/urlinputdialog.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/mvc/conference.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/mvc/conference.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/mvc/conferencemodel.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/mvc/conferencemodel.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/mvc/delegate.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/mvc/delegate.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/mvc/event.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/mvc/event.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/mvc/eventmodel.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/mvc/eventmodel.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/mvc/room.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/mvc/room.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/mvc/track.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/mvc/track.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/mvc/treeview.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/mvc/treeview.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/orm/ormrecord.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/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.

  • src/test/main.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/test/mvc/eventtest.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/test/mvc/eventtest.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.