branch testing commit
branch testing finished
change location of ideen.rtf
added Ideen.pdf and corresponding tex files
moved files
removed files
Merge branch 'master' of github.com:Label/Project-O.R.B.S.
merged
removed us.stackdump
added How to merge.txt
edited How to merge.txt
updated Ideen.pdf and gitignore
update Ideen.pdf after second meeting
updated Ideen.pdf after meeting from 2013.11.18
Merge remote-tracking branch 'origin/ManicDev'
Merge remote-tracking branch 'origin/ManicDev'
added doc/class_diagram_UML.vsdx
changes on class_diagram_UML
- added global package
- moved enumerations from world_generator.dll package to global package
- added comments
- added connections between packages
Merge branch 'master' of github.com:Label/Project-O.R.B.S.
Merge remote-tracking branch 'origin/ManicDev'