Commit Graph

926 Commits

Author SHA1 Message Date
ajacoutot
c269e943e2 Move the default fontpath from /usr/local/lib/X11/fonts to
/usr/local/share/fonts to match XDG_DATA_DIR (where Desktop tools will look for
by default).

discussed with sthen@ and matthieu@
ok sthen@
2015-03-31 09:42:56 +00:00
dcoppa
4b34d0f021 Minor update to xcb-util-cursor-0.1.2
ok matthieu@
2015-03-30 07:16:53 +00:00
jsg
766592491f update to libdrm 2.4.60 2015-03-26 06:00:06 +00:00
matthieu
9b9b8ffe5b Update to libXfont 1.5.1.
Contains fixes for following issues:
CVE-2015-1802: bdfReadProperties: property count needs range check
CVE-2015-1803: bdfReadCharacters: bailout if a char's bitmap cannot be read
CVE-2015-1804: bdfReadCharacters: ensure metrics fit into xCharInfo struct
2015-03-17 20:42:25 +00:00
jsg
f149319ba0 Only build the gallium radeon winsys on i386/amd64 as
those are the only archs that currently use gallium radeon drivers.

It should build anywhere that has the libdrm radeon headers
installed.  And while that should really be everywhere it
isn't at the moment and won't be for release.

It isn't clear why the radeon winsys in Mesa 10.4 didn't have
the same problem.

Found the hard way by todd@ on alpha.
2015-02-23 23:39:27 +00:00
jsg
f62222a305 Backport support for GLX_MESA_query_renderer for non Intel drivers.
This is desirable as the chromium port now uses this extension to
obtain pci vendor/device ids for use in feature/extension blacklists.

Prompted by a mail from byrnet@, tested on r600g by krw@

The newly added os_get_total_physical_memory() was passing the length of
a pointer rather than the type which made the sysctl call fail on
non 64 bit archs.  And it was passing the wrong pointer for the result.
Fixes for these problems have been submitted back upstream.
2015-02-22 09:30:33 +00:00
jsg
82481235fe use .PATH to work around symlinks in dist tarball 2015-02-21 00:39:06 +00:00
jsg
a3c5584b37 switch back to Mesa 10.2
With 10.4.3 gpu compositing on chromium would result in a black window
on older Intel parts (ie x60s with 945gm) and at least some discrete
Radeon parts.  These problems do not seem to occur on recent Intel
parts, though those have coherent memory and hardware contexts.

It isn't clear what changes in Mesa are involved in the problem
though it also occurs with the 10.3 branch.
2015-02-20 23:31:04 +00:00
jsg
9bd5aba6bb update to libdrm 2.4.59 2015-02-07 01:34:35 +00:00
matthieu
87c098c895 Update to libxcb and xcb-proto 1.11.
Tested on a bulk ports build by naddy@.
Lots of churn due to white-space and comments changes in generated code.
2015-01-26 21:32:10 +00:00
jsg
5f55a0a16b Mesa 10.4.3 2015-01-25 15:09:12 +00:00
dcoppa
57be036a1d Bugfixing update to freetype-2.5.5
ok matthieu@
2015-01-10 17:17:22 +00:00
matthieu
936b4cf06e Fix bad merges. 2015-01-01 17:37:52 +00:00
dcoppa
8a4a3c138b Zap some bogus RCS strings added by accident because of CVS keyword
expansion
2014-12-27 18:43:15 +00:00
dcoppa
62705531f4 Update to freetype-2.5.4
ports bulk build by landry@

OK matthieu@
2014-12-26 17:52:34 +00:00
schwarze
01412a19db fix wrong name in .TH, NAME, and SYNOPSIS (obviously bad pastos...)
ok matthieu@
2014-12-09 09:29:52 +00:00
matthieu
6d1b4b2eb2 Update to libXi 1.7.4 2014-09-28 17:22:58 +00:00
matthieu
e67f24e53d Update to libXext 1.3.3 2014-09-28 17:18:23 +00:00
matthieu
3d0a879628 Update to xtrans 1.3.5 2014-09-28 16:56:06 +00:00
kettenis
bbd5563373 Add -DHAVE_LIBDRM to CPPFLAGS when approriate.
ok jsg@
2014-09-28 12:53:26 +00:00
jsg
4727f64aaf Match the behaviour of Mesa when built by autoconf and link
libEGL against libgbm and libglapi.

The libgbm requirement comes from the drm EGL backend that was
enabled with the 10.2.3 update.

ok matthieu@ kettenis@
2014-09-28 11:02:37 +00:00
matthieu
afc8fcf86c I forgot to merge config.h.in in the update to libxcb 1.10.
noticed by and ok kettenis@
2014-09-27 20:04:32 +00:00
matthieu
e4c13334f7 Missed file in libXfont 1.5.0 update 2014-09-27 17:43:02 +00:00
matthieu
e4967fc3e9 Update to libXfont 1.5.0
Tested together with xserver 1.16.1 by naddy@, jsg@ & kettenis@
2014-09-27 17:42:14 +00:00
kettenis
eb9a95d64d Use PCIOCREADMASK to size the PCI BARs. This makes more parts of libpciaccess
usable when machdep.allowaperture is zero.

ok matthieu@
2014-09-27 08:56:18 +00:00
jsg
b222fe706e Mesa 10.2.7 2014-09-07 15:32:18 +00:00
matthieu
17de6442e2 Fix the HAVE_UUID_CREATE code now that its gets used:
- fix temp declaration
- use snprintf instread of strcpy()
2014-08-31 17:57:40 +00:00
matthieu
ec589d938f Install relative symlinks in conf.d. Noticed by ajacoutot@ 2014-08-31 13:50:27 +00:00
jsg
4d28f01d0c update to libdrm 2.4.56 2014-08-14 04:00:28 +00:00
matthieu
7afaae9fe9 Install resource files in /usr/X11R6/share/X11/app-defaults
/etc/X11/app-defaults stays 1st in the libXt search path so, people
and ports can put customized versions there if needed.
If you didn't customize the versions in /etc/X11/app-defaults, they
should be removed to avoid future issues when one file changes.

discussed at g2k14 and ok ajacoutot@
2014-08-13 21:02:16 +00:00
jsg
c63c2890f1 calloc the pci_sys struct before probing for PCI.
As the functions check if the member pointers are NULL but not the
pointer to the struct itself.

Reworked version of a diff from ratchov@ who created it to prevent a
xserver crash on zaurus where there is no PCI.

'looks ok' matthieu@, ok deraadt@
2014-08-06 17:00:09 +00:00
matthieu
aefac52141 Update to pixman 0.32.6 2014-07-20 19:22:20 +00:00
jsg
7eba4784b6 Mesa git no longer includes Intel AUB definitions,
instead it uses the libdrm definitions.

Install the AUB header so this will work.
2014-07-19 17:06:47 +00:00
jsg
92dd606da1 use CPPFLAGS instead of CFLAGS for additional defines/includes 2014-07-17 13:53:23 +00:00
matthieu
bdc9f3dd53 Move the logic that says that the openchrome driver requires librm
to the drivers Makefile, and don't build it if the user choose not
to build libdrm.
2014-07-14 19:06:02 +00:00
matthieu
e52b740c0e Update to libXft 2.3.2 2014-07-12 10:10:57 +00:00
matthieu
5a14c2ef39 Update to libICE 1.0.9 2014-07-12 09:49:11 +00:00
jsg
128505aa0d gallium/targets/{r300,r600,radeonsi}/dri/drm_target.c is now a symlink to
gallium/targets/{r300,r600,radeonsi}/common/drm_target.c in the Mesa source
but cvs import ignores symlinks.

Change the directory we search for drm_target.c in to deal with this.
2014-07-10 08:44:00 +00:00
jsg
ea95abebcf Mesa 10.2.3 2014-07-09 21:32:40 +00:00
nick
a870156568 fix for man pages -- per roff(7), .so should be based in the parent man
page directory.  fixes the following X man 3 pages:
  XTestCompareCurrentCursorWithWindow.man
  XTestCompareCursorWithWindow.man XTestDiscard.man
  XTestFakeButtonEvent.man XTestFakeKeyEvent.man
  XTestFakeMotionEvent.man XTestFakeRelativeMotionEvent.man
  XTestGrabControl.man XTestSetGContextOfGC.man
  XTestSetVisualIDOfVisual.man
2014-06-20 00:38:53 +00:00
matthieu
9364b9c909 Uodate to xcb-util-renderutil 0.3.9 2014-06-15 09:00:40 +00:00
matthieu
4bd039500e Update to libXfont 1.4.8 2014-05-18 12:13:54 +00:00
matthieu
b4cc09fbf4 Update to fontconfig 2.11.1. Tested by shadchin@ 2014-05-18 10:33:03 +00:00
matthieu
05ed5123d1 Security fixes from X.Org Advisory:
X Font Service Protocol & Font metadata file handling issues in libXfont
May 13, 2014

- CVE-2014-0209: integer overflow of allocations in font metadata file parsing

    When a local user who is already authenticated to the X server adds
    a new directory to the font path, the X server calls libXfont to open
    the fonts.dir and fonts.alias files in that directory and add entries
    to the font tables for every line in it.  A large file (~2-4 gb) could
    cause the allocations to overflow, and allow the remaining data read
    from the file to overwrite other memory in the heap.

    Affected functions: FontFileAddEntry(), lexAlias()

- CVE-2014-0210: unvalidated length fields when parsing xfs protocol replies

    When parsing replies received from the font server, these calls do not
    check that the lengths and/or indexes returned by the font server are
    within the size of the reply or the bounds of the memory allocated to
    store the data, so could write past the bounds of allocated memory when
    storing the returned data.

    Affected functions: _fs_recv_conn_setup(), fs_read_open_font(),
    fs_read_query_info(), fs_read_extent_info(), fs_read_glyphs(),
    fs_read_list(), fs_read_list_info()

- CVE-2014-0211: integer overflows calculating memory needs for xfs replies

    These calls do not check that their calculations for how much memory
    is needed to handle the returned data have not overflowed, so can
    result in allocating too little memory and then writing the returned
    data past the end of the allocated buffer.

    Affected functions: fs_get_reply(), fs_alloc_glyphs(),
    fs_read_extent_info()

Reported by Ilja van Sprundel of IOActive
Fixes by Alan Coopersmith of Oracle
2014-05-13 19:09:22 +00:00
jsg
7391d4da2b update to libdrm 2.4.54
ok matthieu@
2014-05-13 05:44:06 +00:00
matthieu
3be5e5d5ea Update to libXi 1.7.2.
Tested by ajacoutot@ against gnome.
2014-05-09 19:55:33 +00:00
matthieu
a88567318b Update to libFS 1.0.6. 2014-05-03 19:33:59 +00:00
jsg
3caad18866 sync LLVM_VERSION with the llvm port. 2014-04-20 10:58:20 +00:00
dcoppa
bd97a70148 unbreak: le32toh() is letoh32() here.
ok matthieu@
2014-04-15 10:23:27 +00:00
matthieu
aa0c7c0d3e Update list of xcb libs to build 2014-04-14 19:33:09 +00:00
matthieu
ad0e152808 Import xcb-util-wm 0.4.1 2014-04-14 19:31:46 +00:00
matthieu
bb22f1b693 Update xcb-util-renderutil 0.3.8 2014-04-14 19:30:59 +00:00
matthieu
f5afeffdb0 Import xcb-util-keysyms 0.3.9 2014-04-14 19:30:20 +00:00
matthieu
6f298b56b1 Import xcb-util-image 0.3.9 2014-04-14 19:29:32 +00:00
matthieu
497c9caab2 Import xcb-util-cursor 0.1.1 2014-04-14 19:28:44 +00:00
matthieu
7283b34154 Update xcb-utils to 0.3.9. Tested by naddy@, shadchin@ and ajacoutot@
who I forgot to thank for testing libxcb-1.10 too.
2014-04-14 19:26:35 +00:00
matthieu
778645a09b Update build system and generated files for libxcb 1.10. 2014-04-14 19:20:17 +00:00
matthieu
35be34cf37 Update to xtrans 1.3.4 2014-04-13 11:57:04 +00:00
jsg
41460e9da0 update to libdrm 2.4.53
For us the only code change is some new radeon_drm.h defines
as the xf86drmMode.c change is ifdef __FreeBSD__.
2014-04-11 06:15:17 +00:00
kettenis
de0199f63b Increase the send buffer for UNIX sockets to be at least 64k such that large
sends (for example, XGetImage() replies in the X server) happen at non-glacial
speeds.  Makes Firefox useable again on web pages with large images.  Already
pushed upstream.

ok matthieu@
2014-03-31 12:09:00 +00:00
matthieu
d7ab44da6c Revert previous. This was not part of our local changes and the
commit wasn't approved. The correct fix is in ../../Makefile
2014-03-15 18:09:43 +00:00
matthieu
e95d5fc7c6 Fix freetype-config after update to freetype 2.5.3. reported by nigel@ 2014-03-15 18:02:09 +00:00
dcoppa
ab67cce656 (re)fix freetype-config too.
Spotted by nigel@
2014-03-15 17:27:50 +00:00
jsg
fd836bcc99 update to libdrm 2.4.52
ok matthieu@
2014-03-15 05:05:55 +00:00
dcoppa
c9a482a02a Revert to the freetype2.pc we had before.
There were local changes and I accidentally removed them.

ok matthieu@

Sorry for breaking the xenocara tree!
2014-03-14 20:41:41 +00:00
dcoppa
6842467b3b Security/bugfixing update to freetype-2.5.3, featuring a fix for a
vulnerability in the CFF driver (CVE-2014-2240) and assorted minor
fixes.

ok matthieu@
2014-03-14 08:17:59 +00:00
kettenis
833d4245d3 We don't need the VGA arbiter if direct hardware access has been disabled.
ok matthieu@
2014-02-20 21:29:07 +00:00
matthieu
44a7f0fe9b type1cid.c appears twice in sources lists for no reason. Noticed by miod@ 2014-02-16 08:10:36 +00:00
kettenis
6dbbb49403 If opening /dev/pciN read-write fails, try opening it read-only. This allows
X to run with machdep.allowaperture=0 on inteldrm(4) and radeondrm(4).

ok matthieu@
2014-02-15 09:48:07 +00:00
jsg
b2251fdbcd Mesa 9.2.5 2014-01-19 03:20:40 +00:00
jsg
dbee37c000 Update libdrm to 2.4.51.
ok mpi@ kettenis@
2014-01-18 08:29:32 +00:00
matthieu
02fca8e3e4 Update to freetype 2.5.2.
With help for handling ports breakage from at least landry@, naddy@,
ajacoutot@, jasper@, and dcoppa@. Thanks to all.

Need an up to date /etc/mtree/BSD.x11.dist (from a base system build)
before building.
2014-01-12 15:08:24 +00:00
miod
f4d0252ced m68k needs libGL compiled with -fPIC 2014-01-11 12:39:14 +00:00
matthieu
4d9b427baa Update to libXfont 1.4.7. Include fix for CVE-2013-6462.
unlimited sscanf overflows stack buffer in bdfReadCharacters
2014-01-07 20:42:20 +00:00
matthieu
c5ffd11875 MFC: Use FT_*_H macros instead of including <freetype/*.h>
freetype moved its headers around in 2.5.1.
2014-01-03 13:01:26 +00:00
matthieu
c754a7ad75 Update to libpciacces 0.13.2. 2014-01-03 09:44:24 +00:00
matthieu
27ccb204c3 Remove the atexit() hack from OpenGL drivers
now that atexit() is behaving like on Linux.
ok matthew@, millert@, dcoppa@, miod@
2013-12-30 18:32:47 +00:00
matthieu
4b4a5ac59b regen ChangeLog for pixman 0.32.4
This file is empty in upstreams tarballs. sigh.
2013-12-26 16:13:01 +00:00
matthieu
4db6d49dbc Update to pixman 0.32.4. Tested by naddy@ and ajacoutot@ 2013-12-01 20:34:20 +00:00
jsg
f0c6bb9965 Mesa 9.2.3 2013-11-24 06:23:35 +00:00
kettenis
2748158d08 update to libdrm 2.4.47
ok mpi@, jsg@
2013-11-21 13:30:07 +00:00
jsg
fd926d2624 Mesa 9.2.2 2013-11-09 02:54:53 +00:00
matthieu
d730882b48 Use arc4random() 2013-10-20 12:40:02 +00:00
matthieu
fe7f17ac1e Reduce diff with upstreams. 2013-10-20 12:34:21 +00:00
matthieu
8e0a332fda Update to freetype 2.5.0.1. Tested by many. 2013-10-10 19:49:34 +00:00
jsg
e14706fc9b regen for Mesa 9.2.1 2013-10-05 10:12:54 +00:00
matthieu
f0a97458d0 Update to libXv 1.0.10 2013-09-28 17:51:20 +00:00
matthieu
4624618994 Update to libXrandr 1.4.2 2013-09-28 17:47:01 +00:00
matthieu
aaee18903a Update to libXpm 3.5.11 2013-09-28 17:40:32 +00:00
matthieu
a52fe2326c Update to libXmu 1.1.2 2013-09-28 17:31:50 +00:00
matthieu
640a513825 Update to libXaw 1.0.12 2013-09-28 17:25:07 +00:00
matthieu
8c1effea43 Update to libX11 1.6.2. No API change. 2013-09-28 17:03:13 +00:00
matthieu
50c06b35c5 Update to libSM 1.2.2 2013-09-14 09:23:02 +00:00
jsg
30ff36c6f4 make an if statement work as intended
fixes build breakage on alpha reported by todd and naddy
2013-09-07 02:12:21 +00:00
jsg
0a47c2f9b5 the i810 driver has been removed from mesa 2013-09-06 07:14:33 +00:00
jsg
3d42c41fe1 Remove now unused makefiles for the non gallium r300/r600 drivers.
The code these files refer to has been removed.
2013-09-06 07:01:09 +00:00
todd
93ce17e2b3 custom is to do NOPROFILE= in X libs, continue this here too 2013-09-05 22:14:39 +00:00
todd
234462b4e8 magic fix so obj dirs become obj links again 2013-09-05 20:23:03 +00:00
jsg
e8c334b0c4 fix a merge error 2013-09-05 15:27:58 +00:00
jsg
18a75284bd build infrastructure changes for Mesa 9.2.0
ok matthieu@ mpi@
2013-09-05 15:11:54 +00:00
jsg
571bd87938 add libtxc_dxtn 1.0.1 a DXTn/S3 texture compression library
ok matthieu@
2013-09-04 05:59:34 +00:00
naddy
ea97b1d614 use arc4random() as the preferred random number source in fontconfig
ok matthieu@
2013-09-01 19:47:52 +00:00
jsg
729f7da411 Update to GLU 9.0.0, GLU was previously part of Mesa but is now seperate.
tested in a ports bulk build by landry@, ok matthieu@
2013-09-01 03:51:12 +00:00
matthieu
b9c30c4c43 regen 2013-08-29 19:55:43 +00:00
matthieu
4f87b9c506 Use arc4random_buf() 2013-08-29 19:54:59 +00:00
matthieu
ce84febd9d Update to libX11 1.6.1. 2013-08-26 19:57:22 +00:00
matthieu
c78f95fc1c Update to pixman 0.30.2. No functional change. 2013-08-25 17:42:39 +00:00
miod
9eba551554 Remove COMPILER_VERSION tests used to special-case gcc 2, since it is no
longer used.
2013-08-22 18:48:45 +00:00
matthieu
abfe418ba3 A local change that can go now that vax is gcc 3 and ELF 2013-08-18 10:58:04 +00:00
matthieu
38bd1cf7e1 Reduce diff with upstreams. (white space) 2013-08-18 10:43:33 +00:00
matthieu
16bd5f45e6 Update to libXfont 1.4.6. 2013-08-18 10:36:20 +00:00
matthieu
f6ad610c9e Fix merge issue. 2013-08-18 10:02:15 +00:00
matthieu
61e2983c70 Fix a number of merge issues accumulated over the years
- INSTALL often got doubled by patch
- empty AUTHORS files didn't get removed.
2013-08-18 06:20:12 +00:00
matthieu
acee5d3c07 Repair guenther's damage that I didn't ok. 2013-08-13 18:52:10 +00:00
kettenis
cb306d7c83 Improve VGA arbiter support now that the kernel gives us information about
the resources required by a particular device.

ok matthieu@, jsg@
2013-08-13 17:24:03 +00:00
guenther
465c44d873 Bump the major to match the 64bit time_t change 2013-08-13 08:58:21 +00:00
guenther
655d680966 Bump the major to match the 64bit time_t change 2013-08-13 08:24:46 +00:00
guenther
a4f712e065 Bump the major to match the 64bit time_t change 2013-08-13 08:06:44 +00:00
guenther
426afb6384 Bump major on libX11-xcb to match the 64bit time_t change 2013-08-13 08:01:13 +00:00
guenther
0e48d7b09c The major on libXaw7 has been bumped, so match that here 2013-08-13 07:42:21 +00:00
guenther
b5bb12998e Bump the major on every single base library. There are a couple
not bumped by this that will be corrected soon.

heavy lifting by todd@
2013-08-13 07:07:07 +00:00
jsg
b9cb6db770 build mesa radeon drivers on sparc64 and switch to gallium drivers
for r300 and r600
2013-08-12 04:16:52 +00:00
jsg
1c76814ee6 build libdrm_radeon on sparc64
ok kettenis@
2013-08-08 10:52:48 +00:00
matthieu
ed83098627 regen 2013-07-20 13:28:41 +00:00
matthieu
7b75257f75 Replace random() with arc4random_buf() 2013-07-20 13:27:38 +00:00
miod
2673d4da6b Do not blindly use __builtin_clz() #ifdef __GNUC__, but only if gcc >= 3.4 for
it did not exist in previous releases.
ok matthieu@
2013-07-17 19:27:22 +00:00
bmercer
34bb22d576 Remove a merge artifact.
OK matthieu
2013-07-10 19:25:00 +00:00
jsg
b9bc50b107 update to libdrm 2.4.46
ok mpi@ kettenis@
2013-07-08 09:10:05 +00:00
jsg
2a3f70cf52 remove another local change that we don't need after
the gem ioctl changes kettenis made.
ok kettenis@
2013-07-01 13:12:52 +00:00
jsg
7c02ec8a3f Define HAVE_LIBDRM_RADEON when compiling radeon dri drivers,
required for newer radeondrm.  Expanded version of a diff from kettenis@
ok kettenis@ mpi@
2013-06-27 14:53:50 +00:00
matthieu
459e6d66cd Update to libXv 1.0.9 2013-06-23 09:51:37 +00:00
jsg
a530660a32 update to libdrm 2.4.45
ok kettenis@ mpi@, tested by ajacoutot@
2013-06-20 09:55:30 +00:00
jsg
65d2acd0c3 add the build infrastructure for the gallium r600 driver
ok mpi@
2013-06-17 23:30:25 +00:00
matthieu
f231986761 Update to libXvMC 1.0.8 2013-06-14 21:40:42 +00:00
matthieu
6f80097364 Update to libXrender 0.9.8. 2013-06-14 21:35:39 +00:00
jsg
1b3475a727 fix rcsid 2013-06-14 05:14:22 +00:00
jsg
fd2bf1e300 add the build infrastructure for the gallium r300 driver
based on an earlier diff from mpi@
ok mpi@
2013-06-13 10:39:28 +00:00
matthieu
44b1fff236 regen 2013-06-08 15:39:14 +00:00
matthieu
6ce12539bb Get rid of a bash-ism 2013-06-08 15:38:51 +00:00
kettenis
980735ac71 Adjust for the changes in our implementation of the DRM_I915_GEM_MMAP and
DRM_I915_GEM_MMAP_GGT ioctls, effectively reverting a local change we made.
2013-06-07 20:48:17 +00:00
matthieu
4848e852b5 Update to freetype 2.4.12. tested by many during t2k13. Thanks. 2013-06-07 17:21:07 +00:00
matthieu
a9e7c8ad2c Update to pixman 0.30.0. Tested by several people during t2k13. Thanks. 2013-06-07 17:18:00 +00:00
kettenis
93897d45ea Fix DRM_RADEON_GEM_WAIT_IDLE ioctl usage; it is defined using DRM_IOW, so
drmCommandWrite() must be used to issue it.  Already merged upstream.

ok jsg@
2013-06-06 20:05:00 +00:00
matthieu
4b8a5f471a Update to libX11 1.6.0 2013-06-04 03:19:34 +00:00
matthieu
00c93c34f7 Update to libXv 1.0.8 2013-06-01 14:31:20 +00:00
matthieu
4a3ec5d53f Update to libXrandr 1.4.1 2013-06-01 14:22:09 +00:00
matthieu
1b76b5cfa9 Update to libXext 1.3.2 2013-05-31 22:17:42 +00:00
matthieu
9573aeb427 Update to libX11 1.5.99.902 aka 1.6rc2 2013-05-31 21:17:09 +00:00
matthieu
531725f77c fix merge issues. 2013-05-31 18:38:23 +00:00
matthieu
749e0e42fc Fix merge error 2013-05-31 16:34:18 +00:00