Shawn Pearce b72a8525f0 Merge branch 'stable-2.6' into stable-2.7 ... * stable-2.6: Use LogManager.DEFAULT_CONFIGURATION_KEY Skip internal logging conf when external one was provided		2013-10-09 09:40:30 -07:00
..
.settings	Remove timestamp from all org.eclipse.core.resources.prefs files.	2012-07-04 14:06:09 +02:00
src	Merge branch 'stable-2.6' into stable-2.7	2013-10-09 09:40:30 -07:00
.gitignore	Add Intellij IDEA files to ignore list	2012-05-03 13:17:43 -07:00
pom.xml	Set version to 2.7	2013-09-18 13:05:11 -07:00