diff options
| author |  waker <wakeroid@gmail.com> | 2009-08-26 16:52:03 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2009-08-26 16:52:03 +0200 |
| commit | 91c33508d0da3cdb4c521df3cf8c7378dc707a8d (patch) | |
| tree | 605ad264d906ff782b11312ae1da7a6176e952ec | |
| parent | 3f8e973b1272bde41b5387ef4b83789d54a56557 (diff) | |
| parent | 9f696086fa2f1c0da2a4835dfc19c24260572380 (diff) | |
Merge branch 'master' into plugins
Conflicts:
bootstrap.sh
| -rwxr-xr-x | bootstrap.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index bb423635..0db33264 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,6 @@ #!/bin/sh aclocal +autoheader libtoolize autoconf automake -a -c |