Changeset 05eac2dbdf9f3a3231dc2eefda62202837fdeec6
- Timestamp:
- 13/04/08 20:16:43
(6 months ago)
- Author:
- Felix Paul Kühne <fkuehne@videolan.org>
- git-committer:
- Felix Paul Kühne <fkuehne@videolan.org> 1208110603 +0200
- git-parent:
[bbdbad09b747deaebd2e6adc7ad9bcb88dbec3c4]
- git-author:
- Felix Paul Kühne <fkuehne@videolan.org> 1208110603 +0200
- Message:
hmm, removing git remainings. Sorry about this
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rbbdbad0 |
r05eac2d |
|
| 2236 | 2236 | |
|---|
| 2237 | 2237 | # *************************************************************************** |
|---|
| 2238 | | <<<<<<< Updated upstream:extras/contrib/src/Makefile |
|---|
| 2239 | 2238 | # YASM assembler |
|---|
| 2240 | 2239 | # *************************************************************************** |
|---|
| … | … | |
| 2255 | 2254 | |
|---|
| 2256 | 2255 | # *************************************************************************** |
|---|
| 2257 | | ======= |
|---|
| 2258 | | >>>>>>> Stashed changes:extras/contrib/src/Makefile |
|---|
| 2259 | 2256 | # Copy aclocal files |
|---|
| 2260 | 2257 | # This is necessary for --missing aclocal to succeed after a |
|---|
