Merge branch 'master' of github.com:nohn/keepassx into master

https://github.com/keepassx/keepassx/pull/29
This commit is contained in:
Felix Geyer 2013-11-24 21:11:15 +01:00
commit 03e4b2d13c

1
.gitignore vendored
View File

@ -1 +1,2 @@
CMakeLists.txt.*
build/