From 0995de16eba687a4a8d0aba3d4aa9dd3f6ed3480 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 16 May 2012 12:39:59 -0400 Subject: [PATCH 1/2] update gitignore with build-modified files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1cb665042b..eb913ff7f8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ /branding_spear /installer_spear Bundle_*.properties +/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Bundle.properties From 65173df7a3a4c24192fd2a455344e8382ae5e006 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 16 May 2012 12:42:48 -0400 Subject: [PATCH 2/2] remove empty line --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index eb913ff7f8..a9b2026f25 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ /KeywordSearch/release/solr/solr/lib/ /KeywordSearch/release/solr/start.jar /KeywordSearch/release/solr/webapps/solr.war - /DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar /DataModel/release/modules/lib/zlib.dll /branding_spear