&eche|on
&zzz
+R4SAS
+RN
+RN_
+StormyCloud
+T3s|4
+acetone
+dr|z3d
+eche|off
+not_bob_afk
+orignal
+postman
+snex
+wodencafe
Arch
BubbRubb
Chrono
Danny
DeltaOreo
FreefallHeavens
Irc2PGuest16752
Irc2PGuest33667
Irc2PGuest51880
Irc2PGuest97218
Onn4l7h
Over
Sisyphus
Sleepy_
Teeed
aargh2
ac9f_
b3t4f4c3__
b4dab00m
bak83_
duanin2
duck
john231
makoto
nilbog-
poriori_
profetik1
r00tobo
rapidash
shiver_
solidx66
thetia
u5657
uop23ip
vivid_reader56
x74a6
xHarr
zzz
eyedeekay, I'm in trouble here, there's a lot more to do than I thought
zzz
I need to rebase so I can see what I'm doing
zzz
what branch should I rebase into or should I create yet another one?
eyedeekay
Creating another one is probably easiest to keep track of
zzz
ok, will do, thanks
zzz
ok still had that build.xml conflict but fixed it. pushed jetty12-rb which is the same as jetty12-2 but rebased to master
zzz
where are we with the SAM PR? you were going to do a command line merge?
eyedeekay
Yes I am going to do a local merge and push it onto master myself
eyedeekay
Can do that for all of them unless you would rather do it for jetty12
zzz
just do the SAM one for now, nothing else is ready, we can decide when we get there
eyedeekay
Ok