| commit | d1cb31f43636e574058f64ac3e5e4cbe20f162b4 | [log] [tgz] |
|---|---|---|
| author | Pierre Ossman <ossman@cendio.se> | Thu Mar 12 11:15:32 2015 +0100 |
| committer | Pierre Ossman <ossman@cendio.se> | Thu Mar 12 11:15:32 2015 +0100 |
| tree | 1260ce593ca99b9fe22eb51b906f54b2c0f567fe | |
| parent | 59b4bc5638ced3cb5f043ccd9ed207fe76148d1a [diff] | |
| parent | 4cf2d3a621ecb9918b57021bc1cee1bd016dc0aa [diff] |
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc Conflicts: contrib/packages/rpm/el5/SPECS/tigervnc.spec vncviewer/Viewport.cxx