codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop

Browse Source
This commit is contained in:
Nick Davis
2014-01-27 16:28:48 -05:00
parent d6e0366c73 c7cfe7dceb
commit e45ec0ff00
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java
View File

@@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI;
*
* @author dfickling
*/
class NoTabsTabDisplayerUI extends TabDisplayerUI {
public class NoTabsTabDisplayerUI extends TabDisplayerUI {
/** Creates a new instance of NoTabsTabDisplayerUI */
public NoTabsTabDisplayerUI(TabDisplayer displayer) {

3
test/script/srcupdater.py
View File

@@ -78,6 +78,9 @@ def gitPull(TskOrAutopsy, branch):
ccwd = os.path.join("..", "..", "..", "sleuthkit")
else:
ccwd = os.path.join("..", "..")
print("Resetting " + TskOrAutopsy)
call = ["git", "reset", "--hard"]
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)
print("Checking out " + branch)
call = ["git", "checkout", branch]
subprocess.call(call, stdout=sys.stdout, cwd=ccwd)