merge js fix
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 16 Jan 2006 10:29:05 +0000 (10:29 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 16 Jan 2006 10:29:05 +0000 (10:29 +0000)
commit5bdd98f4322bae6ab358cd9ca93f50d53abfad27
tree29d5c609e2c142cd34ad2c9809c2bdd246e963a8
parent8c6e8c20e20ab905445fff5e332a504cd450a5e1
merge js fix

git-svn-id: svn+ssh://murphy/home/svn/platal/branches/platal-0.9.9@218 839d8a87-29fc-0310-9880-83ba4fa771e5
htdocs/javascript/close_on_esc.js
htdocs/javascript/xorg.js