Revision f0a96285
| ID | f0a962859924d980350c10d3a36874adc0888d6a |
Merge remote-tracking branch 'origin/xseg' into merger
Conflicts:
xseg/tools/vlmc.py
xseg/tools/xseg_setup.sh
Conflicts Resolution:
vlmc.py:
* Keep the \t -> space changes from the xseg branch
* Keep the new parsing scheme from the tools
xseg_setup.sh:
* Keep the change to sourcing the helpers.sh from
the tools branch
Files
- added
- modified
- copied
- renamed
- deleted