Merge branch 'master' into f17
Conflicts: .gitignore sources merged master
This commit is contained in:
commit
f14431abf9
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/texstudio-2.2.tar.gz
|
||||
/texstudio-2.3.tar.gz
|
||||
/texstudio-2.4.tar.gz
|
||||
/texstudio-2.5.tar.gz
|
||||
|
Loading…
Reference in New Issue
Block a user