[newlisp/f20: 13/13] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/newlisp into f20

[ndowens]

commit 14b66efdca8088a0286fe26e44e9c596f6077806
Merge: ea77848 d3894c3
Author: ndowens <ndowens04 at gmail.com>
Date:   Tue Apr 8 23:11:31 2014 +0000

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/newlisp into f20
    
    Conflicts:
    	.gitignore
    	newlisp.spec
    
    	modified:   .gitignore

 .gitignore |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index e36071c,576debd..bb3f860
--- a/.gitignore
+++ b/.gitignore
@@@ -5,4 -5,5 +5,8 @@@
  /newlisp-10.4.2.tgz
  /newlisp-10.4.3.tgz
  /newlisp-10.5.4.tgz
++<<<<<<< HEAD
++=======
+ /newlisp-0001-Support-64bit.patch
++>>>>>>> d3894c33ba009b24c860a4e51f38325c24b43d41
  /newlisp-10.6.0.tgz