I will merge my branch to trunk again... 2015-08-03 23:19 GMT+02:00 GunChleoc <[email protected]>:
> Since the branch is already pushed and it's a small change, I'd say you > can do the change directly on trunk - just make sure that you don't break > anything. > > Or you can do it in this branch and merge it again. > -- > > https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796 > Your team Widelands Developers is subscribed to branch > lp:~widelands-dev/widelands/attack_fix. > > _______________________________________________ > Mailing list: https://launchpad.net/~widelands-dev > Post to : [email protected] > Unsubscribe : https://launchpad.net/~widelands-dev > More help : https://help.launchpad.net/ListHelp > -- https://code.launchpad.net/~widelands-dev/widelands/attack_fix/+merge/266796 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/attack_fix. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
