| commit | e05c18edb352b770f9f34a926a3dda14d57466a3 | |
| author | Oliver Gloth <ogloth@engits.com> | |
| Tue, 24 Jan 2017 09:45:38 +0000 (24 10:45 +0100) | ||
| committer | Oliver Gloth <ogloth@engits.com> | |
| Tue, 24 Jan 2017 09:45:38 +0000 (24 10:45 +0100) | ||
| tree | 346917fb56fef4f3fe576e113ab12f1265200f4f | treesnapshot (tar.gz zip) |
| parent | a57cb91e78bc2defa2c4ee07fc635ee205ab8480 | commitdiff |
| parent | bf84aa4b692585d7481bb25915ac605fe88bb7d4 | commitdiff |
Merge branch 'master' of github.com:enGits/engrid
# Conflicts:
# src/libengrid/engrid.qrc
# Conflicts:
# src/libengrid/engrid.qrc
| src/libengrid/CMakeLists.txt | diff1 | diff2 | blobhistory |
| src/libengrid/guimainwindow.ui | diff1 | diff2 | blobhistory |