Skip to content

Commit ddbbf12

Browse files
committed
Update main branch
1 parent e50ea46 commit ddbbf12

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

CONTRIBUTING.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ encouraged to create mockups for any issue you see and attach them.
7777
## Hacking
7878

7979
The first thing to keep in mind if you want to modify the source code:
80-
checkout the **master** branch. It is the branch that we use to
80+
checkout the **main** branch. It is the branch that we use to
8181
develop new features and fix issues that are planned for the next big
8282
release. See the [INSTALL](INSTALL.md) guide to know how to compile.
8383

8484
To start looking the source code, see how it is organized in
85-
[src/README.md](https://github.com/aseprite/aseprite/tree/master/src/#aseprite-source-code)
85+
[src/README.md](https://github.com/aseprite/aseprite/tree/main/src/#aseprite-source-code)
8686
file.
8787

8888
## Forking & Pull Requests
@@ -93,22 +93,22 @@ You can fork the GitHub repository using the Fork button at
9393
The Pull Requests (PR) systems works in this way:
9494

9595
1. First of all you will need to sign our
96-
[Contributor License Agreement](https://github.com/aseprite/sourcecode/blob/master/sign-cla.md#sign-the-cla) (CLA).
97-
1. Then you can start working on Aseprite. Create a new branch from `master`, e.g. `fix-8` to fix the issue 8.
96+
[Contributor License Agreement](https://github.com/aseprite/sourcecode/blob/main/sign-cla.md#sign-the-cla) (CLA).
97+
1. Then you can start working on Aseprite. Create a new branch from `main`, e.g. `fix-8` to fix the issue 8.
9898
Check this guide about [how to name your branch](https://github.com/agis/git-style-guide#branches).
9999
1. Start working on that new branch, and push your commits to your fork.
100-
1. Create a new PR to merge your `fix-8` branch to the official `master`.
100+
1. Create a new PR to merge your `fix-8` branch to the official `main`.
101101
1. If the PR is accepted (does not require review/comments/modifications),
102-
your branch is merged into `master`.
103-
1. You will need to pull changes from the official `master` branch, and
104-
merge them in your own `master` branch. Finally you can discard your
102+
your branch is merged into `main`.
103+
1. You will need to pull changes from the official `main` branch, and
104+
merge them in your own `main` branch. Finally you can discard your
105105
own `fix-8` branch (because those changes should be already merged
106-
into `master` if the PR was accepted).
107-
1. Continue working from the new `master` head.
106+
into `main` if the PR was accepted).
107+
1. Continue working from the new `main` head.
108108

109-
To keep in mind: **always** start working from the `master` head, if you
109+
To keep in mind: **always** start working from the `main` head, if you
110110
want to fix three different issues, create three different branches
111-
from `master` and then send three different PR. Do not chain all the
111+
from `main` and then send three different PR. Do not chain all the
112112
fixes in one single branch. E.g. `fix-issues-3-and-8-and-25`.
113113

114114
## Community

src/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ because they don't depend on any other component.
1616
* [clip](https://github.com/aseprite/clip): Clipboard library.
1717
* [fixmath](fixmath/): Fixed point operations (original code from Allegro code by Shawn Hargreaves).
1818
* [flic](https://github.com/aseprite/flic): Library to load/save FLI/FLC files.
19-
* laf/[base](https://github.com/aseprite/laf/tree/master/base): Core/basic stuff, multithreading, utf8, sha1, file system, memory, etc.
20-
* laf/[gfx](https://github.com/aseprite/laf/tree/master/gfx): Abstract graphics structures like point, size, rectangle, region, color, etc.
19+
* laf/[base](https://github.com/aseprite/laf/tree/main/base): Core/basic stuff, multithreading, utf8, sha1, file system, memory, etc.
20+
* laf/[gfx](https://github.com/aseprite/laf/tree/main/gfx): Abstract graphics structures like point, size, rectangle, region, color, etc.
2121
* [observable](https://github.com/aseprite/observable): Signal/slot functions.
2222
* [scripting](scripting/): JavaScript engine.
2323
* [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.
2828
* [cfg](cfg/) (base): Library to load/save .ini files.
2929
* [gen](gen/) (base): Helper utility to generate C++ files from different XMLs.
3030
* [net](net/) (base): Networking library to send HTTP requests.
31-
* laf/[os](https://github.com/aseprite/laf/tree/master/os) (base, gfx, wacom): OS input/output.
31+
* laf/[os](https://github.com/aseprite/laf/tree/main/os) (base, gfx, wacom): OS input/output.
3232

3333
## Level 2
3434

src/clip

src/flic

src/tga

Submodule tga updated 1 file

src/undo

0 commit comments

Comments
 (0)