| commit | b49c08073ed36ff49deabe31593a4b889c969665 | |
| author | lordmulder <mulder2@gmx.de> | |
| Sun, 25 Dec 2011 00:05:03 +0000 (25 01:05 +0100) | ||
| committer | lordmulder <mulder2@gmx.de> | |
| Sun, 25 Dec 2011 00:05:03 +0000 (25 01:05 +0100) | ||
| tree | 60eff337a3f7b79e447067f1c6c9c9bc288613a3 | treesnapshot (tar.gz zip) |
| parent | 30f1795d32ebb348132f97faa9021051db7a810b | commitdiff |
| parent | 8fc1a567c9b99f0ee94c5b413e777347d6ebd86d | commitdiff |
Merge branch 'master' of ssh://lamexp.git.sourceforge.net/gitroot/lamexp/lamexp
Conflicts:
res/MainIcon5.png
src/Config.h
src/Global.cpp
Conflicts:
res/MainIcon5.png
src/Config.h
src/Global.cpp