Merge remote-tracking branch 'origin/master' into f13

Conflicts: .gitignore sources vdr-streamdev.spec
dist-git conversion
2011-02-20 12:36:37 +01:00 · 2010-07-29 14:56:02 +00:00 · 2010-07-25 09:03:26 +00:00 · 2010-02-17 03:24:35 +00:00
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-vdr-streamdev-0.5.0.tgz
 /vdr-streamdev-0.5.1.tgz
Author	SHA1	Message	Date
Felix Kaechele	c3925af225	Merge remote-tracking branch 'origin/master' into f13 Conflicts: .gitignore sources vdr-streamdev.spec	2011-02-20 12:36:37 +01:00
Fedora Release Engineering	6cf69f3277	dist-git conversion	2010-07-29 14:56:02 +00:00
Felix Kaechele	8fd8c809ba	- update to final 0.5.0 release	2010-07-25 09:03:26 +00:00
Jesse Keating	99995bac68	Initialize branch F-13 for vdr-streamdev	2010-02-17 03:24:35 +00:00