# HG changeset patch
# User Tormod Volden <debian.tormod@gmail.com>
# Date 1389462044 -3600
# Node ID 28ed72477814840b7bf6e4d7e4c01718109bac8c
# Parent  260116065a2f50c55b4a7660bc24d589f31c3b26# Parent  df598bc45426be34c2fcb1caf2655fcaf40507c4
Dummy merge of default branch into lwtools

hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m

This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.

When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.

Only scripts/burst was "rescued" from default branch.

diff -r 260116065a2f -r 28ed72477814 3rdparty/booters/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/customboots/boisy/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/burke/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/disto/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/emudsk/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/ide/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/mmc/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/s16550/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/sdisk/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/sdisk3/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/drivers/tccc/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/fmgrs/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/fmgrs/msf/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/p2mods/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/p2mods/noice/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/arcadepak/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/arcadepak/shanghai/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/arcadepak/smash/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/arcadepak/thexder/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/basic09/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/cc/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/coyota/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/deskmate3/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/ed/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/fsim2/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/koronis/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/kyumgai/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/mm/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/multivue/cmds_6309/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/multivue/cmds_6809/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/multivue/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/os9l2bbs/6809l2/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/os9l2bbs/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/pacos9/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/raakatu/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/rof/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/blackcauldron/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/christmas86/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/goldrush/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/kingsquest1/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/kingsquest2/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/kingsquest3/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/kingsquest4/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/leisuresuitlarry/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/manhunter1/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/manhunter2/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/policequest1/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/spacequest0/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/spacequest1/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/sierra/spacequest2/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/subsim/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/uemacs/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/uucpbb/cmds_6309/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/uucpbb/cmds_6809/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/uucpbb/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/packages/uucpbb/src/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/subrtns/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/aaw/mkdskindex
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/boisy/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/dasm/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/smartwatch/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/supercomm/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/view/makefile
diff -r 260116065a2f -r 28ed72477814 3rdparty/utils/winfo/makefile
diff -r 260116065a2f -r 28ed72477814 ChangeLog
diff -r 260116065a2f -r 28ed72477814 bootman/makefile
diff -r 260116065a2f -r 28ed72477814 defs/rbf.d
diff -r 260116065a2f -r 28ed72477814 defs/scsi.d
diff -r 260116065a2f -r 28ed72477814 level1/atari/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/cmds/fuji.asm
diff -r 260116065a2f -r 28ed72477814 level1/atari/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level1/atari/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level1/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level1/d64/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level1/dalpha/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level1/makefile
diff -r 260116065a2f -r 28ed72477814 level1/modules/boot_scsi.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/clock2_dw.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/dw4read.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/dw4write.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/dwio.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/dwread.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/dwwrite.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/kernel/krn.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/rbdw.asm
diff -r 260116065a2f -r 28ed72477814 level1/modules/superdesc.asm
diff -r 260116065a2f -r 28ed72477814 level1/tano/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level1/tano/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/bootlists/dw.bl
diff -r 260116065a2f -r 28ed72477814 level2/coco3/bootroms/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3/scripts/mb.dw
diff -r 260116065a2f -r 28ed72477814 level2/coco3/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/bootlists/dw.bl
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/bootroms/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level2/coco3_6309/scripts/mb.dw
diff -r 260116065a2f -r 28ed72477814 level2/makefile
diff -r 260116065a2f -r 28ed72477814 level2/modules/joydrv_6551L.asm
diff -r 260116065a2f -r 28ed72477814 level2/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3/sys/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/bootfiles/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/cmds/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/defs/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/modules/kernel/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/modules/makefile
diff -r 260116065a2f -r 28ed72477814 level3/coco3_6309/sys/makefile
diff -r 260116065a2f -r 28ed72477814 lib/alib/makefile
diff -r 260116065a2f -r 28ed72477814 lib/makefile
diff -r 260116065a2f -r 28ed72477814 makefile
diff -r 260116065a2f -r 28ed72477814 rules.mak
diff -r 260116065a2f -r 28ed72477814 scripts/burst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/burst	Sat Jan 11 18:40:44 2014 +0100
@@ -0,0 +1,7 @@
+#!/bin/tcsh
+cd /home/project-web/nitros9/htdocs
+rm -rf latest
+mkdir latest
+cd latest
+unzip -o ../nitros9project.zip
+echo "Options +Indexes">.htaccess