summaryrefslogtreecommitdiffstats
path: root/xorg-driver/xf86-video-v4l/HISTORY
diff options
context:
space:
mode:
authorAndraž Levstik2008-03-20 13:18:44 +0100
committerAndraž Levstik2008-03-20 13:18:44 +0100
commite623b6b6ae3bbc9ca6c866a49942a27e1c52a891 (patch)
tree183fa045a5ae93b90e9145e57e8c549ed9ce597b /xorg-driver/xf86-video-v4l/HISTORY
parent6a61f709c57baa2cdc9a957cc93f16b968ca5b2a (diff)
parente4dd6a3e0048aadc8ecbf23bd5945ba40da59537 (diff)
Merge branch 'devel-xorg-modular' of git+ssh://scm.sourcemage.org/smgl/grimoire into devel-xorg-modular
Conflicts: xorg-app/compiz/HISTORY xorg-app/mkfontdir/HISTORY xorg-app/mkfontscale/HISTORY xorg-app/rendercheck/HISTORY xorg-app/twm/HISTORY xorg-app/x11perf/HISTORY xorg-app/xauth/HISTORY xorg-app/xdm/HISTORY xorg-app/xev/HISTORY xorg-app/xinit/HISTORY xorg-app/xkbcomp/HISTORY xorg-app/xprop/HISTORY xorg-app/xrandr/HISTORY xorg-app/xrdb/HISTORY xorg-app/xset/HISTORY xorg-driver/xf86-input-aiptek/HISTORY xorg-driver/xf86-input-joystick/HISTORY xorg-driver/xf86-video-apm/HISTORY xorg-driver/xf86-video-ark/HISTORY xorg-driver/xf86-video-ast/HISTORY xorg-driver/xf86-video-chips/HISTORY xorg-driver/xf86-video-cirrus/HISTORY xorg-driver/xf86-video-dummy/HISTORY xorg-driver/xf86-video-fbdev/HISTORY xorg-driver/xf86-video-glint/HISTORY xorg-driver/xf86-video-i128/HISTORY xorg-driver/xf86-video-i740/HISTORY xorg-driver/xf86-video-neomagic/HISTORY xorg-driver/xf86-video-nv/HISTORY xorg-driver/xf86-video-radeonhd/HISTORY xorg-driver/xf86-video-rendition/HISTORY xorg-driver/xf86-video-s3/HISTORY xorg-driver/xf86-video-s3virge/HISTORY xorg-driver/xf86-video-savage/HISTORY xorg-driver/xf86-video-siliconmotion/HISTORY xorg-driver/xf86-video-sis/HISTORY xorg-driver/xf86-video-sisusb/HISTORY xorg-driver/xf86-video-tdfx/HISTORY xorg-driver/xf86-video-trident/HISTORY xorg-driver/xf86-video-tseng/HISTORY xorg-driver/xf86-video-v4l/HISTORY xorg-driver/xf86-video-vmware/HISTORY xorg-driver/xf86-video-voodoo/HISTORY xorg-font/font-xfree86-type1/HISTORY xorg-lib/libx11/HISTORY xorg-lib/libxext/HISTORY xorg-lib/libxfont/HISTORY xorg-lib/libxinerama/HISTORY xorg-lib/libxkbfile/HISTORY xorg-lib/libxmu/HISTORY xorg-lib/libxscrnsaver/HISTORY xorg-lib/libxv/HISTORY xorg-lib/xtrans/HISTORY xorg-proto/inputproto/HISTORY xorg-proto/printproto/HISTORY xorg-proto/xproto/HISTORY xorg-util/util-macros/HISTORY
Diffstat (limited to 'xorg-driver/xf86-video-v4l/HISTORY')
-rw-r--r--xorg-driver/xf86-video-v4l/HISTORY7
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-driver/xf86-video-v4l/HISTORY b/xorg-driver/xf86-video-v4l/HISTORY
index 6665be619f..7f03bfa5b7 100644
--- a/xorg-driver/xf86-video-v4l/HISTORY
+++ b/xorg-driver/xf86-video-v4l/HISTORY
@@ -3,6 +3,12 @@
fixed WEB_SITE
updated spell to 0.2.0
+2008-03-17 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
+2008-03-16 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
2007-07-14 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: description updated
@@ -39,3 +45,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+