Merge branch 'develop' into release-4.12.0

This commit is contained in:
Richard Cordovano 2019-06-27 15:36:14 -04:00 committed by GitHub
commit f2330a91d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View File

@ -82,6 +82,8 @@ hs_err_pid*.log
/RecentActivity/release/
/CentralRepository/release/
/.idea/
*.img
*.vhd
*.E01

View File

@ -6,8 +6,8 @@ app.name=${branding.token}
### if left unset, version will default to today's date
app.version=4.12.0
### build.type must be one of: DEVELOPMENT, RELEASE
build.type=RELEASE
#build.type=DEVELOPMENT
#build.type=RELEASE
build.type=DEVELOPMENT
project.org.netbeans.progress=org-netbeans-api-progress
project.org.sleuthkit.autopsy.experimental=Experimental