Commit 0d70d8b

Luca Toniolo

committed

Merge branch 'upstream'

2 parents 703b225 + 286cc13 commit 0d70d8bCopy full SHA for 0d70d8b

6 files changed

+170

-184

lines changed

docs/po
- es.po
share/qtvcp/screens
- qtdragon_lathe
  - qtdragon_lathe_handler.py
- qtdragon
  - qtdragon_handler.py
- qtplasmac
  - qtplasmac_handler.py
  - versions.html
src/hal/components
- plasmac.comp

6 files changed

+170

-184

lines changed

Comments

(0)