mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
raman-bt 2014-01-29 12:43:06 -05:00
commit 7d0c40b3a6
2 changed files with 4 additions and 1 deletions
Show Stats 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 * @author dfickling
*/ */
class NoTabsTabDisplayerUI extends TabDisplayerUI { public class NoTabsTabDisplayerUI extends TabDisplayerUI {
/** Creates a new instance of NoTabsTabDisplayerUI */ /** Creates a new instance of NoTabsTabDisplayerUI */
public NoTabsTabDisplayerUI(TabDisplayer displayer) { public NoTabsTabDisplayerUI(TabDisplayer displayer) {

3
test/script/srcupdater.py
View File

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