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