Christian Fiedler 018619e599 Merge branch 'develop' into feature/#173 ...

Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop

2013-10-02 19:03:20 +02:00

..

Model

finish#211

2013-10-02 13:27:45 +02:00

Properties

add Portal lib

2013-08-26 15:09:18 +02:00

Resources

mv lecture

2013-10-02 12:48:35 +02:00

Utility

Merge branch 'develop' into feature/#173

2013-10-02 19:03:20 +02:00

CampusAppWPortalLib8.csproj

mv lecture

2013-10-02 12:48:35 +02:00

Settings.StyleCop

Merge branch 'develop' into feature/#173

2013-10-02 19:03:20 +02:00