Merge remote-tracking branch 'local12x/1.2.x'

2015-10-19 12:56:55 -07:00
parent 5080e2d71f a79131f8d2
commit 1e4d974ec0
573 changed files with 791 additions and 360 deletions
--- a/eclipse/org.eclipse.jdt.ui.prefs
+++ b/eclipse/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@ formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;;\#;
+org.eclipse.jdt.ui.importorder=java;javax;;org.springframework;\#;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999