Salome HOME
projects
/
modules
/
hydro.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
883fcee
43fbb9c
)
Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP
author
asl
<asl@opencascade.com>
Wed, 21 Oct 2015 08:25:14 +0000
(11:25 +0300)
committer
asl
<asl@opencascade.com>
Wed, 21 Oct 2015 08:25:14 +0000
(11:25 +0300)
Conflicts:
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.h
src/HYDRO_tests/TestViewer.cxx
1
2
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge
