dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-05-24 12:35:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

broken merge, forgot to resolve conflict

Browse source
This commit is contained in:
sidorares 2011-07-18 10:59:53 +10:00
parent bf81e3170e
commit 21d6f27ff2
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/x11/corereqs.js
View file

@ -107,11 +107,6 @@ module.exports = {
CreateWindow: [ CreateWindow: [
// create request packet - function OR format string // create request packet - function OR format string
function(id, parentId, x, y, width, height, borderWidth, _class, visual, values) { function(id, parentId, x, y, width, height, borderWidth, _class, visual, values) {
<<<<<<< HEAD
console.log('CreateWindow called', id);
=======
>>>>>>> 3d3658d0b81642440a915e706d2c28b412c1a383
// TODO: ??? there is depth field in xproto, but xlib just sets it to zero // TODO: ??? there is depth field in xproto, but xlib just sets it to zero
var depth = 0; var depth = 0;