Merge branch 'release-4.12.0' of github.com:sleuthkit/autopsy into view_file_in_directory_5186

This commit is contained in:
Eugene Livis 2019-06-28 13:30:44 -04:00
commit d61f29bc9f
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View File

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

View File

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