Merge remote branch 'origin/master' into f13

Conflicts: .gitignore sources ucview.spec
dist-git conversion
2010-10-18 01:04:29 +02:00 · 2010-07-29 14:36:52 +00:00 · 2010-02-27 00:58:50 +00:00 · 2010-02-17 03:22:52 +00:00
1 changed files with 15 additions and 0 deletions
--- a/ucview-0.31-include.patch
+++ b/ucview-0.31-include.patch
@ -0,0 +1,15 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for ucview >= 0.31 to fix broken
+include. Upstream is aware about the issue - and this should be fixed for the next
+release of ucview.
+
+--- ucview-0.31/src/ucview-window.h		2009-12-08 18:25:26.000000000 +0100
+++ ucview-0.31/src/ucview-window.h.include	2010-02-21 18:59:53.000000000 +0100
+@@ -12,7 +12,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
+-#include <ucview/ucview.h>
+#include <ucview.h>
+ 
+ #define UCVIEW_GCONF_DIR "/apps/ucview"
+ #define UCVIEW_PLUGIN_GCONF_DIR "plugins"
Author	SHA1	Message	Date
Robert Scheck	76bc60fbb3	Merge remote branch 'origin/master' into f13 Conflicts: .gitignore sources ucview.spec	2010-10-18 01:04:29 +02:00
Fedora Release Engineering	3575a741b4	dist-git conversion	2010-07-29 14:36:52 +00:00
Robert Scheck	d74eabdb7a	Upgrade to 0.31 (#530708 )	2010-02-27 00:58:50 +00:00
Jesse Keating	7773340132	Initialize branch F-13 for ucview	2010-02-17 03:22:52 +00:00