Commit Graph
4 Commits
Author SHA1 Message Date
Axel Uhl 7cc977f0ad Merge branch 'master' into integration_tests
Conflicts:
	java/.gitignore
	java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
2013-01-09 09:35:57 +01:00
Axel Uhl 266532cccd added java/log to .gitignore 2013-01-08 20:22:06 +01:00
D049941 d25646ed3e The bin folder is now ignored for all java projects. 2012-12-13 17:54:46 +01:00
Axel Uhl 65d432d0aa ignored temporary gwt cache directories 2012-01-04 00:39:18 +01:00