asf - Revision 1917285: /lucene/dev/branches/fieldtype_conflicted

• ..
• .gitignore
• .hgignore
• README.txt
• build.xml
• dev-tools/
• lucene/
• modules/
• solr/