prefs
Merge remote-tracking branch 'origin/3_mainLayout' into 10_Contact_Layout
PhoneCall working + ContactView Start
dimensions
Merge remote-tracking branch 'origin/3_mainLayout' into
10_Contact_Layout

Conflicts:
	lunchdroid/.settings/org.eclipse.core.resources.prefs
untracked
nn
nn
mmm
Contact View erweitert
Google Maps changes (weiß nicht, ob der API Key auch bei euch
funktioniert)
EMpty list rücksicht genommen und getData für jeden Wochendtag
Merge branch '3_mainLayout' into 10_Contact_Layout

Conflicts:
	lunchdroid/.settings/org.eclipse.core.resources.prefs
	lunchdroid/src/com/example/lunchdroid/TabDistanceActivity.java
Merge remote-tracking branch 'origin/10_Contact_Layout' into 10_Contact_Layout
by id