modified:   source/workspace/Launcher/gen/dk/aau/cs/giraf/gui/R.java
	modified:   source/workspace/OasisApp/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/PARROT/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/PARROT/gen/yuku/ambilwarna/R.java
	modified:   source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/Wombat/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/Wombat/gen/dk/aau/cs/giraf/wombat/drawlib/R.java
	modified:   source/workspace/Wombat/gen/kankan/wheel/R.java
	modified:   source/workspace/Wombat/gen/yuku/ambilwarna/R.java
To lisbeth
Merge remote-tracking branch 'origin/Klim' into Lisbeth