Merge branch 'f14' into f13

Conflicts: .gitignore
dist-git conversion
2010-11-01 09:27:47 -05:00 · 2010-07-29 14:46:29 +00:00 · 2010-02-17 03:23:43 +00:00
1 changed files with 0 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,2 @@
 upx-3.04-src.tar.bz2
 lzma465.tar.bz2
-/upx-3.07-src.tar.bz2
-/lzma465.tar.bz2
Author	SHA1	Message	Date
Jon Ciesla	9dc964fa49	Merge branch 'f14' into f13 Conflicts: .gitignore	2010-11-01 09:27:47 -05:00
Fedora Release Engineering	37c70f9121	dist-git conversion	2010-07-29 14:46:29 +00:00
Jesse Keating	0cb3c18bdc	Initialize branch F-13 for upx	2010-02-17 03:23:43 +00:00