H. Peter Anvin fbce0bfb4e Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved Conflicts:
	asm/directiv.dat
	asm/preproc.c
	misc/omfdump.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2017-08-16 22:41:40 -07:00
..
2009-11-11 08:09:03 +01:00
2010-09-30 22:10:34 +04:00
2010-09-30 22:10:34 +04:00
2010-09-30 22:10:34 +04:00
2008-10-16 13:03:40 -07:00
2011-08-31 01:22:43 +04:00
2009-03-17 16:18:41 -07:00
2010-08-16 15:23:16 -07:00
2010-09-30 22:10:34 +04:00
2009-04-17 16:17:59 +02:00
2009-04-17 16:17:59 +02:00
2013-07-21 14:45:48 +04:00
2010-09-30 22:10:34 +04:00
2010-09-30 22:10:34 +04:00
2009-11-11 08:09:03 +01:00
2008-11-04 14:25:12 -08:00
2010-03-12 23:52:04 +01:00
2010-09-30 22:10:34 +04:00
2010-09-30 22:10:34 +04:00
2010-09-30 22:10:34 +04:00
2010-08-09 18:47:05 +04:00
2010-09-30 22:10:34 +04:00
2010-09-24 15:25:59 +04:00
2010-11-06 18:44:48 +03:00
2010-11-06 23:09:47 +03:00
2011-02-14 22:14:51 +03:00
2011-02-21 18:19:04 +03:00
2011-03-07 12:42:46 +03:00
2011-03-07 11:29:56 +03:00
2012-03-06 11:18:02 +04:00
2013-05-13 02:21:08 +04:00
2013-07-21 14:45:48 +04:00
2007-10-11 20:32:33 -07:00
2009-11-11 08:09:03 +01:00
2009-04-17 16:17:59 +02:00
2012-05-31 10:28:00 -07:00
2010-08-24 14:08:16 -07:00
2002-04-30 20:52:08 +00:00
2002-04-30 20:51:32 +00:00
2011-06-26 01:53:38 +04:00
2013-12-18 22:37:36 -08:00
2002-04-30 20:52:49 +00:00
2007-10-11 20:32:33 -07:00
2010-07-09 15:05:32 -07:00
2009-11-11 08:09:03 +01:00
2009-11-11 08:09:03 +01:00
2009-11-11 08:09:03 +01:00
2008-10-08 23:32:33 -07:00
2016-11-15 11:55:14 -08:00
2013-11-20 11:29:42 -08:00
2013-11-20 11:29:42 -08:00
2008-10-19 16:47:53 -07:00
2008-10-19 16:47:53 -07:00
2008-10-19 16:47:53 -07:00
2012-02-25 15:29:37 -08:00
2011-06-22 18:20:28 -07:00
2009-11-11 08:09:03 +01:00