diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/des/times | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/des/times')
| -rw-r--r-- | src/lib/libcrypto/des/times/aix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/times/aix.cc b/src/lib/libcrypto/des/times/aix.cc index e9b2e45751..d96b74e2ce 100644 --- a/src/lib/libcrypto/des/times/aix.cc +++ b/src/lib/libcrypto/des/times/aix.cc | |||
| @@ -2,10 +2,10 @@ From: Paco Garcia <pgarcia@cam.es> | |||
| 2 | 2 | ||
| 3 | This machine is a Bull Estrella Minitower Model MT604-100 | 3 | This machine is a Bull Estrella Minitower Model MT604-100 |
| 4 | Processor : PPC604 | 4 | Processor : PPC604 |
| 5 | P.Speed : 100MHz | 5 | P.Speed : 100Mhz |
| 6 | Data/Instr Cache : 16 K | 6 | Data/Instr Cache : 16 K |
| 7 | L2 Cache : 256 K | 7 | L2 Cache : 256 K |
| 8 | PCI BUS Speed : 33 MHz | 8 | PCI BUS Speed : 33 Mhz |
| 9 | TransfRate PCI : 132 MB/s | 9 | TransfRate PCI : 132 MB/s |
| 10 | Memory : 96 MB | 10 | Memory : 96 MB |
| 11 | 11 | ||