Skip to content

Commit 4afb41a

Browse files
committed
Merge branch 'xbridge-new-2'
2 parents b5dc34d + 56e4f74 commit 4afb41a

264 files changed

Lines changed: 28261 additions & 146446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
config.pri
22
*.user
3+
build-*
4+
*.qm
35

46
# Windows image file caches
57
Thumbs.db

Makefile

Lines changed: 0 additions & 347 deletions
This file was deleted.

0 commit comments

Comments
 (0)