@eyedeekay
&eche|on
&zzz
+Irc2PGuest61619
+R4SAS
+RN
+RN_
+StormyCloud
+T3s|4
+acetone
+cumlord
+dr|z3d
+eche|off
+hagen
+orignal
+postman
+qend-irc2p
+snex
Arch
Birdy
Daddy
Danny
FreefallHeavens
Irc2PGuest1537
Irc2PGuest20240
Irc2PGuest21366
Irc2PGuest22568
Irc2PGuest57061
Irc2PGuest68429
Irc2PGuest7705
Irc2PGuest96466
Onn4l7h
Onn4|7h
Over1
Sisyphus
Sleepy
SlippyJoe
Stormycloud_
Teeed
aargh2
ac9f_
anontor
b3t4f4c3__
dr4wd3
duanin2
duck
gellegery
leopold
leopold_
makoto
n1
neowurt
nilbog
not_bob_afk
nyaa2pguy
onon_
poriori_
profetikla
r00tobo
rapidash
shiver_
solidx66
thetia
u5657
uop23ip
urist
user1
vivid_reader56
w8rabbit
x74a6
zelgomer
zyx_
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