aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-16353-10482/+11062
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-16353-10346/+10921
| |
* | Added missing file to projectmarha2012-04-134-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1320-434/+1262
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-1321-441/+1262
| |
* | Increased version to 1.12.0.11.12.0.1marha2012-04-114-3/+824
| |
* | Synchronised filesmarha2012-04-108-197/+981
| |
* | Solved link errors because snprintf was not remapped to _snprintfmarha2012-04-102-0/+3
| |
* | Synchronised filesmarha2012-04-108-24/+21
| |
* | Updated gl.spec with latest versionmarha2012-04-101-55/+44
| |
* | Synchronised filesmarha2012-04-104-2600/+2585
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-10259-31553/+263578
|\|
| * Updated following packages:marha2012-04-10259-31553/+263578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23
* | Merge remote-tracking branch 'origin/released'marha2012-04-10486-5823/+72489
|\| | | | | | | | | | | | | | | | | Conflicts: openssl/Configure openssl/Makefile openssl/crypto/opensslconf.h openssl/util/mk1mf.pl openssl/util/pl/VC-32.pl
| * Update to openssl-1.0.1marha2012-04-10488-5838/+72558
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1091-10971/+10830
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-1091-10969/+10830
| |
* | Solved problem when specifying -fullscreen on command line because defaultmarha2012-04-101-0/+2
| | | | | | | | | | resizing behaviour was changed to resize (which is not allowed in fullscreen)
* | Ignore generated .3 files in libxcb/src/man1.12.0.0marha2012-03-301-0/+1
| |
* | Increased version to 1.12.0.0marha2012-03-304-3/+795
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-302-4/+21
|\|
| * fontconfig git update 30 mar 2012marha2012-03-302-4/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-299-24/+79
|\|
| * xserver fontconfig mesa git update 29 Mar 2012marha2012-03-299-24/+79
| |
* | Synchronised filesmarha2012-03-285-426/+2030
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-2820-118/+3633
|\|
| * xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012marha2012-03-2820-118/+3633
| |
* | Solved compiler warnings and link errors on windowsmarha2012-03-281-0/+7
| |
* | Synchronised filesmarha2012-03-2812-3201/+4048
| |
* | synchronised gen.bat with makefilemarha2012-03-282-0/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-28119-16895/+21865
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-27119-16895/+21865
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-2622-22/+163
|\|
| * fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012marha2012-03-2622-22/+163
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-261038-329846/+326265
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/shm.c xorg-server/Xext/syncsrv.h xorg-server/Xext/xvmain.c xorg-server/Xi/exevents.c xorg-server/Xi/opendev.c xorg-server/composite/compalloc.c xorg-server/composite/compoverlay.c xorg-server/dix/colormap.c xorg-server/dix/devices.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/dix/eventconvert.c xorg-server/dix/events.c xorg-server/dix/gc.c xorg-server/dix/getevents.c xorg-server/dix/main.c xorg-server/dix/privates.c xorg-server/dix/registry.c xorg-server/dix/resource.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/fb/fb.h xorg-server/fb/fbcopy.c xorg-server/fb/fbpixmap.c xorg-server/glx/dispatch.h xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmds.c xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdricommon.c xorg-server/glx/glxdriswrast.c xorg-server/glx/glxext.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_util.c xorg-server/glx/rensize.c xorg-server/glx/single2swap.c xorg-server/glx/singlepix.c xorg-server/glx/singlepixswap.c xorg-server/glx/singlesize.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/ephyr/hostx.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/compiler.h xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glwrap.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.h xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winallpriv.c xorg-server/hw/xwin/winauth.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincmap.c xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winlayouts.h xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winregistry.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/wintrayicon.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c xorg-server/include/callback.h xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/include/os.h xorg-server/include/scrnintstr.h xorg-server/mi/micmap.c xorg-server/mi/miinitext.c xorg-server/mi/mioverlay.c xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/mi/miwindow.c xorg-server/miext/damage/damage.c xorg-server/miext/rootless/rootlessGC.c xorg-server/miext/rootless/rootlessWindow.c xorg-server/os/WaitFor.c xorg-server/os/access.c xorg-server/os/connection.c xorg-server/os/io.c xorg-server/os/log.c xorg-server/os/osinit.c xorg-server/os/utils.c xorg-server/os/xdmcp.c xorg-server/os/xprintf.c xorg-server/os/xstrans.c xorg-server/render/mipict.c xorg-server/xkb/xkbActions.c xorg-server/xkb/xkbInit.c xorg-server/xkeyboard-config/compat/default.in
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231031-308230/+314446
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-1318-238/+106
|\|
| * fontconfig mesa git update 13 Mar 2012marha2012-03-1318-238/+106
| |
* | Made creation of temp files interprocess safe in windowsmarha2012-03-127-37/+83
| | | | | | | | | | | | | | Fixes for 64-bit compilation Implemented realpath function Improved auodep scanning Solved a problem in dependency scanning
* | Updated libraries in makefile for freetype249marha2012-03-125-12/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-12201-2082/+3882
|\| | | | | | | | | | | | | | | Conflicts: freetype/src/base/ftrfork.c freetype/src/cff/cffpic.c freetype/src/pfr/pfrobjs.c freetype/src/winfonts/winfnt.c
| * Updated to freetype-2.4.9marha2012-03-12201-2082/+3882
| |
* | Synchronised files with mesamarha2012-03-128-1662/+1775
| |
* | Added ftsynth and ftbitmap to project filemarha2012-03-124-3/+13
| |
* | Added main/errors.c to projectmarha2012-03-122-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-12122-15224/+13595
|\| | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
| * xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012marha2012-03-12122-15220/+13591
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-0911-262/+324
|\| | | | | | | | | Conflicts: libxcb/src/xcb_in.c
| * libxcb fontconfig pixman mesa git update 9 Mar 2012marha2012-03-0912-258/+325
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-0816-119/+188
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c