[00:53:04] <-- nutron has left IRC (Ping timeout: 272 seconds)
[00:57:42] --> nutron has joined #exult
[01:34:43] --> DominusExult has joined #exult
[01:34:43] <-- DominusExult has left IRC (Changing host)
[01:34:43] --> DominusExult has joined #exult
[01:34:43] --- ChanServ gives channel operator status to DominusExult
[01:38:16] <-- Dominus has left IRC (Ping timeout: 256 seconds)
[01:38:16] --- DominusExult is now known as Dominus
[03:10:48] <-- Rottingbeef-2 has left IRC (Ping timeout: 260 seconds)
[03:12:44] --> Rottingbeef-2 has joined #exult
[03:48:34] <-- Rottingbeef-2 has left IRC (Ping timeout: 246 seconds)
[03:52:16] --> Rottingbeef-2 has joined #exult
[03:52:17] <-- Rottingbeef-2 has left IRC (Remote host closed the connection)
[06:43:44] <-- Lightkey has left IRC (Ping timeout: 244 seconds)
[06:57:13] --> Lightkey has joined #exult
[07:22:20] --> Marzo has joined #exult
[08:21:00] <Dominus> Marzo: how do I best cherry pick from https://github.com/DavidLudwig/exult-ios/commits/master ? As it is based on the iOS fork and not directly on our git.
[09:11:52] <Marzo> That would have been one great reason for merging the iOS fork history into our main repo, because it requires pretty much the same steps
[09:13:41] <Marzo> You basically have to get an Exult clone, add the fork as a secondary remote and pull it in, then you can cherry-pick or merge
[09:14:51] <Marzo> Here is an example: https://gist.github.com/bhumphrey/3764983
[09:14:55] <Marzo> The first comment is important
[09:40:38] <Dominus> Thanks! I'll have to test that fork a bit and then later will probably add that
[09:41:42] <Dominus> I think these are the same steps you told me back then to be able to cherry pick from Exult into the iOS fork ;)
[11:47:15] --> Rottingbeef-2 has joined #exult
[18:59:27] <-- Rottingbeef-2 has left IRC (Ping timeout: 265 seconds)
[19:37:14] <-- Marzo has left IRC (Ping timeout: 272 seconds)
[21:26:37] --> Rottingbeef-2 has joined #exult
[22:41:35] <-- Dominus has left IRC (Read error: Connection reset by peer)
[22:42:04] --> Dominus has joined #exult
[22:42:05] <-- Dominus has left IRC (Changing host)
[22:42:05] --> Dominus has joined #exult
[22:42:05] --- ChanServ gives channel operator status to Dominus
[22:51:51] --> DominusExult has joined #exult
[22:51:51] <-- DominusExult has left IRC (Changing host)
[22:51:51] --> DominusExult has joined #exult
[22:51:51] --- ChanServ gives channel operator status to DominusExult
[22:54:50] <-- Dominus has left IRC (Ping timeout: 258 seconds)
[22:54:51] --- DominusExult is now known as Dominus