Skip to content
Snippets Groups Projects
Commit a20c9b86 authored by Zoltan Mathe's avatar Zoltan Mathe
Browse files

Merge branch 'devel' into 'devel'

Devel

See merge request !379
parents bb1046b1 d3ef1727
No related branches found
No related tags found
No related merge requests found
......@@ -15,10 +15,7 @@
[ "pygraphics", "2.0",
[ "bin", "python", "lib" ]
],
[ "qt", "4.8.7",
[ "bin", "python", "lib" ]
],
[ "gcc", "4.9.3",
[ "Qt", "4.8.7",
[ "bin", "python", "lib" ]
],
[ "jsonc", "0.12",
......
......@@ -30,9 +30,6 @@
[ "Qt", "4.8.7",
[ "bin", "python", "lib" ]
],
[ "gcc", "4.9.3",
[ "bin", "python", "lib" ]
],
[ "mysql", "5.7.11",
[ "bin", "python", "lib" ]
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment