diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-10 19:35:18 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-10 19:35:18 +0100 |
| commit | 84d889efa1a6d41c2c3c48569a83d846e3fcf014 (patch) | |
| tree | 213636827ea5ee0f065d5d378437125246321ef7 /.gitignore | |
| parent | 7222d40f99bac414147c880be2f0aa3f0c9d7249 (diff) | |
| parent | 4476b2df112bfa69abe6e142346c574016371b58 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 39e79e21ef..293da460fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1243,5 +1243,4 @@ autom4te.cache /xbmc/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake /xbmc/visualizations/XBMCProjectM/libprojectM/config.inp -/xbmc/win32/svn_rev.h - +/xbmc/win32/git_rev.h |