summaryrefslogtreecommitdiffstats
path: root/logic/java
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/fix_intel' into developPetr Mrázek2014-06-28-5/+5
| | | | | | | Conflicts: CMakeLists.txt changelog.yaml gui/MainWindow.cpp
* Reorganize logic code.Petr Mrázek2014-06-09-0/+914