Skip to content

Commit

Permalink
Merge branch 'master' into multicastvnc
Browse files Browse the repository at this point in the history
  • Loading branch information
bk138 committed Mar 3, 2025
2 parents b4d4a09 + 4d4c4fe commit caddfeb
Show file tree
Hide file tree
Showing 20 changed files with 755 additions and 153 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
dry-run: false
language: c++
- name: Upload Crash
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
Expand Down
52 changes: 2 additions & 50 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,58 +1,10 @@
*.swp
*~
Makefile
*.pc
LibVNCServer*.tar.gz
rfbconfig.h
*.o
*.a
*.so
*.so.*
client_examples/SDLvncviewer
client_examples/backchannel
client_examples/gtkvncviewer
client_examples/ppmtest
client_examples/vnc2mpg
build/
doc/
examples/zippy
examples/backchannel
examples/blooptest
examples/camera
examples/cursors
examples/colourmaptest
examples/example
examples/filetransfer
examples/fontsel
examples/mac
examples/pnmshow
examples/pnmshow24
examples/regiontest
examples/repeater
examples/rotate
examples/simple
examples/simple15
examples/storepasswd
examples/vncev
examples/x11
test/blooptest
test/cargstest
test/copyrecttest
test/encodingstest
test/wstest
/test/tjbench
/test/tjunittest
vncterm/LinuxVNC
vncterm/VNCommand
vncterm/example
/vncterm/linuxvnc
/vncterm/vncommand
CMakeCache.txt
/CMakeFiles
/rfbproto.pdf
/rfbproto.rst
/vencrypt.txt
/INSTALL
doc/html/
.ccls-cache
.cachexs
.log
compile_commands.json
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "webclients/novnc"]
path = webclients/novnc
url = https://github.com/novnc/noVNC.git
[submodule "doc/doxygen-awesome-css"]
path = doc/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Tim Gates, Dinglan Peng, Ryo Ota, Kyle Evans, Kang Lin, Derek Schrock,
Alex Converse, Thorsten Scherer, Marco Fortina, Antenore Gatta, Maxim Devaev
Maksym Sobolyev, Huben Chang, Peter Vicman, Johann Obermayr, Nicolas Morais,
Volodymyr Samokhatko, Mingjie Shen, Joris Hans Meijer, Sérgio Basto,
Jeffrey Knockel and Christian Hitz.
Jeffrey Knockel, Christian Hitz and Chih-Hsuan Yen.

Probably we forgot quite a few people sending a patch here and there, which
really made a difference. Without those, some obscure bugs still would
Expand Down
Loading

0 comments on commit caddfeb

Please sign in to comment.