Merge branch '2.5' into 2.6

Conflicts:
	tcsh/.md5sum
	tcsh/Pkgfile
This commit is contained in:
Juergen Daubert 2009-07-22 12:56:27 +02:00
commit 2a20400122
2 changed files with 2 additions and 2 deletions

View File

@ -1 +1 @@
0db94e88fd9b7a360f826f9ffd6c0fc7 nasm-2.06.tar.bz2
d8934231e81874c29374ddef1fbdb1ed nasm-2.07.tar.bz2

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=nasm
version=2.06
version=2.07
release=1
source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.bz2)