Merge remote branch 'upstream/master'
Conflicts: mbus/mbus-protocol.c
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,4 +1,7 @@
|
||||
.project
|
||||
*~
|
||||
*.o
|
||||
*.so
|
||||
*.la
|
||||
*.lo
|
||||
.libs/
|
||||
|
Reference in New Issue
Block a user