| commit | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d | |
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Thu, 24 Jul 2008 23:14:16 +0000 (25 02:14 +0300) | ||
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Thu, 24 Jul 2008 23:50:58 +0000 (25 02:50 +0300) | ||
| tree | 1ba215c9978eadcd6b99b2c696b22ea6a3779e33 | treesnapshot (tar.gz zip) |
| parent | 577587ec6ce8dad59c303a76cba03af03db879a3 | commitdiff |
| parent | 901574e3bf6ff45a46a12dc7884a93970f9d58d1 | commitdiff |
Merge svn changes up to r27347
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.