diff options
| author |  waker <wakeroid@gmail.com> | 2009-08-31 20:01:55 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2009-08-31 20:01:55 +0200 |
| commit | 08e1a932dd88cb9195a1ce70d4b62e5d513460f3 (patch) | |
| tree | 4e1315110f96042e441a3b5bcdb034bbbcb4754f /.gitignore | |
| parent | 6aabd78cc8ac501d3b43e4cfb6893612f5012cf5 (diff) | |
| parent | 58a92f3cfe79597cc345ba6bd41668c9a44afdde (diff) | |
Merge branch 'master' into plugins
Conflicts:
.gitignore
configure.in
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,4 +35,4 @@ m4 .libs *.la *.lo - +deadbeef.desktop |