dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-06-24 17:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflict

Browse source
This commit is contained in:
Andrey Sidorov 2012-12-13 00:59:46 +11:00
parent aa94a9e5b3
commit 34efb7ad30
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/x11/ext/glxrender.js
View file

@ -54,8 +54,6 @@ module.exports = function(GLX, ctx) {
buffers.push(res); buffers.push(res);
}; };
<<<<<<< HEAD
=======
function serialize2i(opcode, value1, value2) { function serialize2i(opcode, value1, value2) {
var res = commandBuffer(opcode, 12); var res = commandBuffer(opcode, 12);
res.writeUInt32LE(value1, 4); res.writeUInt32LE(value1, 4);
@ -63,7 +61,6 @@ module.exports = function(GLX, ctx) {
buffers.push(res); buffers.push(res);
} }
>>>>>>> a5087c35c661b9177afa3c7a31502543a9dd2d51
function serialize1i(opcode, value) { function serialize1i(opcode, value) {
var res = commandBuffer(opcode, 8); var res = commandBuffer(opcode, 8);
res.writeUInt32LE(value, 4); res.writeUInt32LE(value, 4);