versuch
s Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.
updated classpath
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie

Conflicts:
	src/de/tu_darmstadt/gdi1/pacman/tests/PacmanTestInterfaceMinimal.java
Entfernung einer lib
MASTER:
alte Testklassen (./tests/TestAdapter) vom Master gelöscht
testdatei.txt auch
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie.git
Merge branch 'master' of
https://github.com/lecticarius/Robbenkolonie.git

Conflicts:
	.classpath
many errors occures by now at my workstation through changes,
which didnt before.
many errors occures by now at my workstation through changes,
which didnt before.
.classpath bei mir editiert, sollte eigentlich ignoriert werden oO
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie.git
kommentare eingefügt, da Bug
Kommentare wieder entfernt
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie.git
die testklasse kann raus
  awesome changes, nossi gui added /res/pictures
  fully functional project
Merge pull request #4 from lecticarius/menu-feature

  awesome changes, nossi gui added /res/pictures
    .classpath aus tree entfernt
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie