Skip to content

Master #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PearlAmin wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Master #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2082f6
take into account cmake_modules changes for issues 231 and 232
fbaguelin Jul 25, 2013
15ad343
* Changes repo url for submodules
fbaguelin Sep 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
[submodule "dff/api"]
path = dff/api
url = git://git.digital-forensic.org/api
path = dff/api
url = https://github.com/arxsys/dff-api
branch = develop
[submodule "dff/ui"]
path = dff/ui
url = git://git.digital-forensic.org/ui
path = dff/ui
url = https://github.com/arxsys/dff-ui
branch = develop
[submodule "dff/modules"]
path = dff/modules
url = git://git.digital-forensic.org/modules
path = dff/modules
url = https://github.com/arxsys/dff-modules
branch = develop
[submodule "cmake_modules"]
path = cmake_modules
url = git://git.digital-forensic.org/cmake_modules
path = cmake_modules
url = https://github.com/arxsys/dff-cmake_modules
branch = develop
[submodule "doc"]
path = doc
url = git://git.digital-forensic.org/doc
path = doc
url = https://github.com/arxsys/dff-doc
branch = develop
[submodule "dff/unsupported"]
path = dff/unsupported
url = git://git.digital-forensic.org/unsupported
[submodule "prerequisites"]
path = prerequisites
url = git://git.digital-forensic.org/installdeps
path = dff/unsupported
url = https://github.com/arxsys/dff-unsupported
branch = develop
2 changes: 1 addition & 1 deletion cmake_modules
Open in desktop
Submodule cmake_modules updated 4 files
+0 −24 FindPyQt.py
+0 −53 FindPyQt4.cmake
+1 −1 FindPythonLibrary.cmake
+9 −0 FindSWIG.cmake