Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 11:04:36 +0000 (13:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 11:04:41 +0000 (13:04 +0200)
commit60058c1880f2260ad8a900d54a89a3f2cb4aa4ac
tree9d8a6109b819948d94b9ca8d120be235940e82c7
parentf0fbd9105bc1edbd40fc06246aded92a9a6a5d3a
parent766f2d965ff1948749c37f26a714adb8aa89c4a9
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
.gitignore