aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-05-1855-509/+871
|\ | | | | | | | | Conflicts: mesalib/src/glsl/builtin_functions.cpp
| * plink fontconfig mesa xserver xkeyboard-config git update 18 May 2014marha2014-05-1856-511/+873
| | | | | | | | | | | | | | | | xserver commit 01e18af17f8dc91451fbd0902049045afd1cea7e xkeyboard-config commit 2bf80b0d9b36fd56acf1f196fb781f045351efaf fontconfig commit 58acd993cb13b58c61633174071ef42da3dcac85 mesa commit 5646319f25c7880b3706bb7590e24c84fd8de0fc plink revision 10192
* | Synchronised filesmarha2014-05-118-7521/+8384
| |
* | Merge remote-tracking branch 'origin/released'marha2014-05-1196-853/+5901
|\| | | | | | | | | Conflicts: mesalib/src/mesa/main/imports.h
| * mesa git update 11 May 2014marha2014-05-118-19/+76
| | | | | | | | mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
| * xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014marha2014-05-0894-834/+5825
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415 xkeyboard-config commit 3e54f31b1f118f00c240f59d72d7ddb685c6db79 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 91f32ce961bc85f98b3372b95681ad8918d24b18 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 399db42a151687f1181ae23d28a76d31125a2853 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit 9ced3fc649ec04710a5f5c855bfb582b898cff83
* | Increase version to 1.15.0.21.15.0.2marha2014-05-017-6/+1136
| |
* | Solved problem with notab and noframe stylesmarha2014-05-017-79/+155
| |
* | Synchronised filesmarha2014-05-011-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2014-05-0167-1101/+1594
|\| | | | | | | | | | | | | Conflicts: libxcb/src/xcb_util.c mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/os/utils.c
| * xkeyboard-config libxcb xserver mesa git update 1 May 2014marha2014-05-0167-1101/+1594
| | | | | | | | | | | | | | xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097 mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
* | Merge remote-tracking branch 'origin/released'marha2014-04-232-3/+3
|\|
| * Synchrnoised plink with svn version of puttymarha2014-04-232-3/+3
| |
* | Solved compile problems due to latest mergemarha2014-04-234-226/+239
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-23120-7869/+3338
|\| | | | | | | | | | | | | Conflicts: mesalib/include/GL/glext.h xorg-server/.gitignore xorg-server/glx/glxext.c
| * fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr 2014marha2014-04-23120-7872/+3396
| | | | | | | | | | | | | | | | xserver commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1 xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad pixman commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
* | plink: Added missing files in makefilesmarha2014-04-231-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-152-0/+278
|\|
| * Added plink noterm.c winhsock.cmarha2014-04-152-0/+278
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-151-0/+102
|\|
| * Added plink/winnpc.cmarha2014-04-151-0/+102
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-151-0/+248
|\|
| * Added plink/winnps.cmarha2014-04-151-0/+248
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-142-0/+291
|\|
| * Added pmink errsock.c winshare.cmarha2014-04-142-0/+291
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-143-0/+2392
|\|
| * Added plink callback.c sshshare.c winsecur.cmarha2014-04-143-0/+2392
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-141-0/+63
|\|
| * Added plink/winsecur.hmarha2014-04-141-0/+63
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-1447-39384/+41768
|\| | | | | | | | | | | | | | | Conflicts: tools/plink/misc.h tools/plink/ssh.c tools/plink/sshbn.c tools/plink/winplink.c
| * plink: updated to revision 10170 of puttymarha2014-04-1447-39329/+41713
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-1465-110/+422
|\| | | | | | | | | | | | | Conflicts: openssl/Configure openssl/Makefile openssl/util/pl/VC-32.pl
| * Updated openssl to version 1.0.1gmarha2014-04-1466-114/+426
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-13205-3906/+8423
|\|
| * fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014marha2014-04-13199-3871/+8281
| | | | | | | | | | | | | | | | | | xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3 libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999 pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0 fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67 mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13
| * libxtrans mesa git update 31 Mar 2014marha2014-03-3111-43/+150
| | | | | | | | | | libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 mesa commit d681b22ed77274a805c6c8e81925c18eeb57a968
* | Increase version to 1.15.0.11.15.0.1marha2014-03-317-6/+1121
| |
* | Merge remote-tracking branch 'origin/released'marha2014-03-2915-34/+25
|\|
| * xserver mesa git update 29 Mar 2014marha2014-03-2915-34/+25
| | | | | | | | | | xserver commit 8468e24430988058b150dc1daef3aad6ba9fa698 mesa commit 9b6b084eb7b10d006b44e3cd22585fc3e39e0c00
* | Solved crashes in 64-bit due to latest mergemarha2014-03-294-14/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2014-03-28149-4105/+6893
|\| | | | | | | | | Conflicts: X11/xtrans/Xtrans.c
| * libxtrans fontconfig mesa xserver git update 28 Mar 2014marha2014-03-28119-2019/+3824
| | | | | | | | | | | | | | xserver commit a2880699e8f1f576e1a48ebf25e8982463323f84 libxtrans commit 68f60238c4224f954ff6556ae778c72e420175f0 fontconfig commit fcba9ef01c978323fc71c17e455d3cd6ae35edcc mesa commit 029ccd773d01a5f801c809c499516d7b0c4cc3f8
| * Update following packages:marha2014-03-2830-2087/+3070
| | | | | | | | | | libXfont-1.4.7 xproto-7.0.25
* | Increased version to 1.15.01.15.0marha2014-03-257-6/+1110
| |
* | Merge remote-tracking branch 'origin/released'marha2014-03-254-1/+64
|\|
| * mesa git update 25 Marc 2014marha2014-03-254-1/+64
| | | | | | | | mesa commit b995a010e688bc4d4557e973e5e28091c378e881
* | Merge remote-tracking branch 'origin/released'marha2014-03-2544-239/+748
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmsgwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libxcb mesa xserver git update 24 Mar 2014marha2014-03-2446-229/+762
| | | | | | | | | | | | | | xserver commit bf087659f0fb747c471e26c5b287c35877818040 libxcb commit e2813e1cde893f384fa620ff3c13493beebabe0c fontconfig commit 9260b7ec39c34ce68d74e16d47917290a8c3f35a mesa commit 0d99aef6c8a940e52afcbffa7091ff9c854ba120
* | Merge remote-tracking branch 'origin/released'marha2014-03-21102-2520/+2531
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014 Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_util.c libxcb/src/xcb_windefs.h mesalib/src/mapi/glapi/glapi.h
| * xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014marha2014-03-21102-2518/+2436
| | | | | | | | | | | | | | | | | | xserver commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 libxcb commit cb686b576739deea00180c54697c8b62b8419ae0 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 fontconfig commit 5478192f379d784b421329e4bf72cc780818e467 mesa commit 8d8d0cb09eb8735a04fc36cc4d0e2dc9f9d460eb
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 18:46:32 +0000