]> ToastFreeware Gitweb - toast/confclerk.git/history - src/gui/conflictdialogcontainer.h
Merged changes from trunk. It still compiles successfully. :-)
[toast/confclerk.git] / src / gui / conflictdialogcontainer.h
2015-01-13 Philipp SpitzerMerged changes from trunk. It still compiles successful...
2013-04-19 gregor herrmannbump copyright years
2012-06-12 gregor herrmannAdd Stefan as a copyright holder to source files, too.
2012-03-21 gregor herrmannUpdate copyright years.
2011-10-17 Philipp SpitzerThe conflict editor works again.
2011-06-23 gregor herrmannAdd copyright to source.
2011-06-23 gregor herrmannUpdate GPL blurb in source files.
2010-02-02 uzakmatA header with the proper copyright/lincence statement...
2010-01-27 pavelpa'conflict' list is automatically expanded
2010-01-27 pavelpa'conflict' dialog now contains list of events in confli...
2010-01-27 pavelpaimplemented 'conflicts' dialog