diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-04-05 18:38:35 -0500 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-04-05 18:38:35 -0500 |
| commit | 646f844f69cc74b8eebf25cc76663b2ee851e5d3 (patch) | |
| tree | 78bd6209e630a980715f30c152365853c9021ece /.gitignore | |
| parent | 817f6e658d0cec41088692e2424d5d7b1a20a333 (diff) | |
| parent | a705cd625cd4ae61ba05cb8333a46662429ca6a1 (diff) | |
| download | libtdevnc-646f844f69cc74b8eebf25cc76663b2ee851e5d3.tar.gz libtdevnc-646f844f69cc74b8eebf25cc76663b2ee851e5d3.zip | |
Merge branch 'repeater'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -48,9 +48,11 @@ examples/colourmaptest examples/example examples/filetransfer examples/fontsel +examples/mac examples/pnmshow examples/pnmshow24 examples/regiontest +examples/repeater examples/rotate examples/simple examples/simple15 @@ -78,3 +80,5 @@ CMakeCache.txt cmake_install.cmake /CMakeFiles /rfbproto.pdf +/rfbproto.rst +/vencrypt.txt |