diff options
author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-07 01:58:24 +0100 |
---|---|---|
committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-07 01:58:24 +0100 |
commit | 60cdc1303f6fe7e44c743137d08ee17dfd10f360 (patch) | |
tree | 1593672e14416a25a5701064f2764e3994d40321 /.gitignore | |
parent | 84c533c79336f69cd66237d7afd3df878ea2aebf (diff) | |
parent | 569648f2a3b8e094c33d102edd41397ca04b07be (diff) |
Merge remote branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0a28144739..ce46e354b3 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,7 @@ autom4te.cache /stamp-h1 /xbmc.bin /xbmc-xrandr -/svn_revision.h +/git_revision.h # /addons/ /addons/com.nullsoft.milkdrop.xbmc/*.vis |