Merge branch 'master' into 'master' (40ad8bc7) · Commits · Roger Petri / Frontend · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

Frontend
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

40ad8bc7

Commit 40ad8bc7 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

# Conflicts:
#   Wetterstation/Form1.Designer.cs
#   Wetterstation/Form1.cs

parents f4888320 ce691ef3

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Wetterstation/Form1.Designer.cs 249 additions, 58 deletions

Wetterstation/Form1.Designer.cs
Wetterstation/Form1.cs 106 additions, 154 deletions

Wetterstation/Form1.cs
Wetterstation/Properties/Resources.Designer.cs 30 additions, 0 deletions

Wetterstation/Properties/Resources.Designer.cs
Wetterstation/Properties/Resources.resx 11 additions, 2 deletions

Wetterstation/Properties/Resources.resx
Wetterstation/Resources/pfeil_oben.png 0 additions, 0 deletions

Wetterstation/Resources/pfeil_oben.png
Wetterstation/Resources/pfeil_quer.png 0 additions, 0 deletions

Wetterstation/Resources/pfeil_quer.png
Wetterstation/Resources/pfeil_quer.xcf 0 additions, 0 deletions

Wetterstation/Resources/pfeil_quer.xcf
Wetterstation/Resources/pfeil_unten.png 0 additions, 0 deletions

Wetterstation/Resources/pfeil_unten.png
Wetterstation/Resources/roterPfeil.png 0 additions, 0 deletions

Wetterstation/Resources/roterPfeil.png
Wetterstation/Wetterstation.csproj 3 additions, 0 deletions

Wetterstation/Wetterstation.csproj

with 399 additions and 214 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment