summaryrefslogtreecommitdiffhomepage
path: root/qfunctionconfigurator/qfunctionconfigurator.h
AgeCommit message (Collapse)Author
2013-04-02Just put everything new in. Conflict resolution will be laterStanislaw Halik
2013-04-02merge continuesStanislaw Halik