| commit | ac2e9cad288a803c87638af031dd56d04b664e28 | |
| author | Oliver Gloth <ogloth@engits.com> | |
| Wed, 9 Jul 2014 15:54:51 +0000 (9 17:54 +0200) | ||
| committer | Oliver Gloth <ogloth@engits.com> | |
| Wed, 9 Jul 2014 15:54:51 +0000 (9 17:54 +0200) | ||
| tree | 705a614ffdc54180178d013ac6fec31223f6c65e | treesnapshot (tar.gz zip) |
| parent | e6d55f564c20a8d13bee6bba6280a32320f1bde2 | commitdiff |
| parent | ecb4c9efd9adffa24433a630c2683fd0a10e4f2e | commitdiff |
Merge branch 'new_concept'
Conflicts:
src/libengrid/guimainwindow.ui
Conflicts:
src/libengrid/guimainwindow.ui