Commit Graph

10 Commits

Author SHA1 Message Date
Christian Fiedler
4f1ff8b0ce CountChar 2013-10-24 11:29:51 +02:00
Christian Fiedler
55339f2da6 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWP8/Settings.StyleCop
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop
2013-10-22 17:33:13 +02:00
stubbfel
6d29a46b63 refatcor utilityplc 2013-10-15 13:13:09 +02:00
Christian Fiedler
7cbf8de66b Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	work/geoApi/Offlinemap.xml
2013-10-11 15:02:04 +02:00
stubbfel
59a726370e finish 2013-10-11 13:44:46 +02:00
stubbfel
31da6d78a7 finish #216 2013-10-09 11:43:49 +02:00
Christian Fiedler
5f7a563f26 merged develop into #173 2013-09-23 09:55:33 +02:00
stubbfel
771e1fc7b5 add nfc and qr to map 2013-09-19 12:34:53 +02:00
stubbfel
04ff3ad80b add filter pid medhod to stringmanager 2013-09-19 10:55:07 +02:00
stubbfel
2f5c104860 add docs 2013-09-18 14:50:32 +02:00