Changeset ebe26af in confclerk_git for README


Ignore:
Timestamp:
01/11/17 21:35:17 (6 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

File:
1 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
Note: See TracChangeset for help on using the changeset viewer.