Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release-4.1.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rcordovano committed Aug 9, 2016
2 parents 730ff02 + 0c351e0 commit 5effdbf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions NEWS.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---------------- VERSION 4.1.1 --------------
Bug Fixes:
- Restored ability of Python modules to import standard Python libraries.

---------------- VERSION 4.1.0 --------------
Improvements:
- New list view in Timeline tool
Expand Down
2 changes: 1 addition & 1 deletion nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ app.title=Autopsy
### lowercase version of above
app.name=${branding.token}
### if left unset, version will default to today's date
app.version=4.1.0
app.version=4.1.1
### build.type must be one of: DEVELOPMENT, RELEASE
#build.type=RELEASE
build.type=DEVELOPMENT
Expand Down

0 comments on commit 5effdbf

Please sign in to comment.