| commit | ba13e10414b972855ea23eaa34c2c405a90fa0d3 | |
| author | Oliver Gloth <ogloth@engits.com> | |
| Wed, 2 Dec 2009 11:49:18 +0000 (2 12:49 +0100) | ||
| committer | Oliver Gloth <ogloth@engits.com> | |
| Wed, 2 Dec 2009 11:49:18 +0000 (2 12:49 +0100) | ||
| tree | a81e4e9b76b69e21993a5864a4e2eab6d6c00fe1 | treesnapshot (tar.gz zip) |
| parent | 844022986239e24299e12b485c9367039b210c22 | commitdiff |
| parent | 4ab5695b8e41df9226d4e64d55784209c20d0519 | commitdiff |
Merge branch 'master' into release
Conflicts:
src/engrid.kdevses
src/scripts/engrid_installer_updater.cfg
Conflicts:
src/engrid.kdevses
src/scripts/engrid_installer_updater.cfg
| src/engrid.kdevses | blob1 | blob2 | history |
| src/gridsmoother.cpp | diff1 | diff2 | blobhistory |