diff options
| author | Raphael Moll <ralf@android.com> | 2012-04-23 09:49:27 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-23 09:49:27 -0700 |
| commit | 89634ab66351ea859d65d81a15431c53fa379794 (patch) | |
| tree | bf2b2fc4a716d84a22bf84437d3b0ad17460742e | |
| parent | 78805488af6d622bc53a6c1b383fc5e00f54a056 (diff) | |
| parent | 89135a3d398545a8108b0bce7b232a230a14d03b (diff) | |
| download | eclipse-basebuilder-89634ab66351ea859d65d81a15431c53fa379794.tar.gz | |
Merge "Ignore a settings file recreated by P2."
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs | 29 |
2 files changed, 1 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0c0dc07 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.engine/.settings diff --git a/basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs b/basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs deleted file mode 100644 index ed3854d..0000000 --- a/basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs +++ /dev/null @@ -1,29 +0,0 @@ -#Fri Mar 30 15:24:24 PDT 2012 -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/suffix=artifacts.xml -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/type=org.eclipse.equinox.p2.artifact.repository.simpleRepository -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/version=1.0.0 -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/uri=file\:/usr/local/google/home/vsiva/internal/master/vendor/eclipse/basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.core/cache/ -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/type=org.eclipse.equinox.p2.artifact.repository.simpleRepository -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/isSystem=true -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/provider= -eclipse.preferences.version=1 -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/enabled=true -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/description= -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/name=download cache -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/version=1.0.0 -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/isSystem=true -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/provider= -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/type=org.eclipse.equinox.p2.artifact.repository.simpleRepository -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/suffix=artifacts.xml -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/isSystem=true -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/suffix=artifacts.xml -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/enabled=true -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/uri=file\:/usr/local/google/home/raphael/master-internal/vendor/eclipse/basebuilder-3.6.2/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.core/cache/ -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/version=1.0.0 -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/description= -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/provider= -repositories/file\:_usr_local_google_home_vsiva_internal_master_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/name=download cache -repositories/file\:_usr_local_google_home_vsiva_internal_master_prebuilts_tools_build_basebuilder_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/uri=file\:/usr/local/google/home/vsiva/internal/master/prebuilts/tools/build/basebuilder/org.eclipse.releng.basebuilder/p2/org.eclipse.equinox.p2.core/cache/ -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/name=download cache -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/enabled=true -repositories/file\:_usr_local_google_home_raphael_master-internal_vendor_eclipse_basebuilder-3.6.2_org.eclipse.releng.basebuilder_p2_org.eclipse.equinox.p2.core_cache/description= |