Marcel Hirschle ab9a3019db Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master ...

# Conflicts:
#	BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
#	BeWo/ServiceProxy/Generated.cs

2021-11-09 16:54:44 +01:00

..

DefaultReports

MH: Testcommit

2021-10-28 11:16:54 +02:00

Properties

push test

2017-08-28 16:41:19 +02:00

ReportObjects

Konflikte behoben

2021-11-08 20:39:15 +01:00

AbstractBeWoReportObject.cs

moved from SVN to git

2016-06-27 01:45:38 +02:00

AbstractReportCreator.cs

Konflikte behoben

2021-11-08 20:39:15 +01:00

app.config

Fat-Client:

2021-10-13 16:00:33 +02:00

DefaultReportCreator.cs

Konflikte behoben

2021-11-08 20:39:15 +01:00

IBeWoReport.cs

moved from SVN to git

2016-06-27 01:45:38 +02:00

Report.csproj

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master

2021-11-09 16:54:44 +01:00

Report.csproj.user

cb reports

2021-05-24 21:40:02 +02:00

Sr2.cs

moved from SVN to git

2016-06-27 01:45:38 +02:00

Sr2.Designer.cs

moved from SVN to git

2016-06-27 01:45:38 +02:00