summaryrefslogtreecommitdiff
path: root/version
diff options
context:
space:
mode:
authorKeith Kanios <keith@kanios.net>2010-11-06 17:41:51 -0500
committerKeith Kanios <keith@kanios.net>2010-11-06 17:41:51 -0500
commitb307a4f1eb9c481732f80088ceceba6a63ccfe4d (patch)
treee71cd3b0ebfff689ff50122258c0460d16df0cc5 /version
parent2672af737954fb17ec0ebf17e787219a504c4400 (diff)
downloadnasm-b307a4f1eb9c481732f80088ceceba6a63ccfe4d.tar.gz
nasm-b307a4f1eb9c481732f80088ceceba6a63ccfe4d.tar.bz2
nasm-b307a4f1eb9c481732f80088ceceba6a63ccfe4d.zip
preproc.c: merge from preproc-rewrite branch
pptok.dat: merge from preproc-rewrite branch macros.pl: merge from preproc-rewrite branch version: changed to 2.10rc2
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index b93485a..d5a145a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.10rc1
+2.10rc2