Merge branch 'master' into f17

Conflicts:
	.gitignore
	sources

merged master
This commit is contained in:
hannes 2012-10-27 11:07:51 +02:00
commit f14431abf9
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/texstudio-2.2.tar.gz
/texstudio-2.3.tar.gz
/texstudio-2.4.tar.gz
/texstudio-2.5.tar.gz

View File

@ -1 +1 @@
5b158c73ffcea28ac35e318ef55e853f texstudio-2.4.tar.gz
84818db5999d2724eba525aa6f116e8b texstudio-2.5.tar.gz