Merge branch 'f13' into f12

Conflicts: .gitignore sources upx.spec
Merge branch 'f14' into f13
2010-11-01 09:33:54 -05:00 · 2010-11-01 09:27:47 -05:00 · 2010-07-29 14:46:31 +00:00 · 2010-07-29 14:46:29 +00:00 · 2010-02-17 03:23:43 +00:00 · 2010-01-08 15:55:54 +00:00
1 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1 @@
-upx-3.04-src.tar.bz2
-lzma465.tar.bz2
-/upx-3.07-src.tar.bz2
-/lzma465.tar.bz2
+upx-3.03-src.tar.bz2
Author	SHA1	Message	Date
Jon Ciesla	fb99dcb5ff	Merge branch 'f13' into f12 Conflicts: .gitignore sources upx.spec	2010-11-01 09:33:54 -05:00
Jon Ciesla	9dc964fa49	Merge branch 'f14' into f13 Conflicts: .gitignore	2010-11-01 09:27:47 -05:00
Fedora Release Engineering	0206becb04	dist-git conversion	2010-07-29 14:46:31 +00: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
Jon Ciesla	1c02b8c033	LZMA fixes by John Reiser (jreiser@bitwagon.com) BZ 501636.	2010-01-08 15:55:54 +00:00
Bill Nottingham	b5a7c49800	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:15:38 +00:00
Jesse Keating	be10c22c95	Initialize branch F-12 for upx	2009-09-29 07:13:21 +00:00