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)
* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

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

diff --cc .gitignore
Simple merge