From ddbbf12bfc58c070661148ca4b2bb8aeaf3b362c Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 5 Mar 2021 18:39:36 -0300 Subject: [PATCH] Update main branch --- CONTRIBUTING.md | 24 ++++++++++++------------ laf | 2 +- src/README.md | 6 +++--- src/clip | 2 +- src/flic | 2 +- src/observable | 2 +- src/tga | 2 +- src/undo | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1d2600b7e..bf31fae10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,12 +77,12 @@ encouraged to create mockups for any issue you see and attach them. ## Hacking The first thing to keep in mind if you want to modify the source code: -checkout the **master** branch. It is the branch that we use to +checkout the **main** branch. It is the branch that we use to develop new features and fix issues that are planned for the next big release. See the [INSTALL](INSTALL.md) guide to know how to compile. To start looking the source code, see how it is organized in -[src/README.md](https://github.com/aseprite/aseprite/tree/master/src/#aseprite-source-code) +[src/README.md](https://github.com/aseprite/aseprite/tree/main/src/#aseprite-source-code) file. ## Forking & Pull Requests @@ -93,22 +93,22 @@ You can fork the GitHub repository using the Fork button at The Pull Requests (PR) systems works in this way: 1. First of all you will need to sign our - [Contributor License Agreement](https://github.com/aseprite/sourcecode/blob/master/sign-cla.md#sign-the-cla) (CLA). -1. Then you can start working on Aseprite. Create a new branch from `master`, e.g. `fix-8` to fix the issue 8. + [Contributor License Agreement](https://github.com/aseprite/sourcecode/blob/main/sign-cla.md#sign-the-cla) (CLA). +1. Then you can start working on Aseprite. Create a new branch from `main`, e.g. `fix-8` to fix the issue 8. Check this guide about [how to name your branch](https://github.com/agis/git-style-guide#branches). 1. Start working on that new branch, and push your commits to your fork. -1. Create a new PR to merge your `fix-8` branch to the official `master`. +1. Create a new PR to merge your `fix-8` branch to the official `main`. 1. If the PR is accepted (does not require review/comments/modifications), - your branch is merged into `master`. -1. You will need to pull changes from the official `master` branch, and - merge them in your own `master` branch. Finally you can discard your + your branch is merged into `main`. +1. You will need to pull changes from the official `main` branch, and + merge them in your own `main` branch. Finally you can discard your own `fix-8` branch (because those changes should be already merged - into `master` if the PR was accepted). -1. Continue working from the new `master` head. + into `main` if the PR was accepted). +1. Continue working from the new `main` head. -To keep in mind: **always** start working from the `master` head, if you +To keep in mind: **always** start working from the `main` head, if you want to fix three different issues, create three different branches -from `master` and then send three different PR. Do not chain all the +from `main` and then send three different PR. Do not chain all the fixes in one single branch. E.g. `fix-issues-3-and-8-and-25`. ## Community diff --git a/laf b/laf index d94de223f..b7a819fda 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit d94de223fc40e541a8d2c992783885c8e3de7a69 +Subproject commit b7a819fda100d48b5903e4ed523830b4b2f00560 diff --git a/src/README.md b/src/README.md index 61aca601a..b4531fd5a 100644 --- a/src/README.md +++ b/src/README.md @@ -16,8 +16,8 @@ because they don't depend on any other component. * [clip](https://github.com/aseprite/clip): Clipboard library. * [fixmath](fixmath/): Fixed point operations (original code from Allegro code by Shawn Hargreaves). * [flic](https://github.com/aseprite/flic): Library to load/save FLI/FLC files. - * laf/[base](https://github.com/aseprite/laf/tree/master/base): Core/basic stuff, multithreading, utf8, sha1, file system, memory, etc. - * laf/[gfx](https://github.com/aseprite/laf/tree/master/gfx): Abstract graphics structures like point, size, rectangle, region, color, etc. + * laf/[base](https://github.com/aseprite/laf/tree/main/base): Core/basic stuff, multithreading, utf8, sha1, file system, memory, etc. + * laf/[gfx](https://github.com/aseprite/laf/tree/main/gfx): Abstract graphics structures like point, size, rectangle, region, color, etc. * [observable](https://github.com/aseprite/observable): Signal/slot functions. * [scripting](scripting/): JavaScript engine. * [steam](steam/): Steam API wrapper to avoid static linking to the .lib file. @@ -28,7 +28,7 @@ because they don't depend on any other component. * [cfg](cfg/) (base): Library to load/save .ini files. * [gen](gen/) (base): Helper utility to generate C++ files from different XMLs. * [net](net/) (base): Networking library to send HTTP requests. - * laf/[os](https://github.com/aseprite/laf/tree/master/os) (base, gfx, wacom): OS input/output. + * laf/[os](https://github.com/aseprite/laf/tree/main/os) (base, gfx, wacom): OS input/output. ## Level 2 diff --git a/src/clip b/src/clip index 5377679fd..f13c9656d 160000 --- a/src/clip +++ b/src/clip @@ -1 +1 @@ -Subproject commit 5377679fd32f977b32b51d83e0fdc027adcdfe78 +Subproject commit f13c9656d51482c1908c9a551ce76f9450b7bd55 diff --git a/src/flic b/src/flic index 5cc354761..1e0630d31 160000 --- a/src/flic +++ b/src/flic @@ -1 +1 @@ -Subproject commit 5cc35476177355e035d2ea4b8f7465bb1addb93c +Subproject commit 1e0630d310b55abf7d16d3d89feeb13936d540f8 diff --git a/src/observable b/src/observable index 62da6c427..af94c4a23 160000 --- a/src/observable +++ b/src/observable @@ -1 +1 @@ -Subproject commit 62da6c4279528505a0fb0e7e31afb9b82cd5aea9 +Subproject commit af94c4a2317839ce629eb26ce47b80e810cbdaec diff --git a/src/tga b/src/tga index db4237e67..ea8005303 160000 --- a/src/tga +++ b/src/tga @@ -1 +1 @@ -Subproject commit db4237e672d9e7370f074a273b49644588754d82 +Subproject commit ea8005303f42925fa1180d1f6e973a816c0b80af diff --git a/src/undo b/src/undo index 64bc33ab6..e72730478 160000 --- a/src/undo +++ b/src/undo @@ -1 +1 @@ -Subproject commit 64bc33ab67c42330cc6cedd528c23eb33c445d64 +Subproject commit e72730478aa6d4dc3be0c914058a7e0561aabe1e