diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/gui/textpopup.cpp | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | plus-stripped1.1.10.2.tar.gz plus-stripped1.1.10.2.tar.bz2 plus-stripped1.1.10.2.tar.xz plus-stripped1.1.10.2.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/gui/textpopup.cpp')
0 files changed, 0 insertions, 0 deletions