|
|
<!--- Hierarchical list of branches included in `birdhouse-build-master`. Conflicting branches get separate merger branches before merging into `birdhouse-build-master`. For example, if something gets fixed in frame interpolation, the code will be first committed to `fkart-12` and then merged to `fkart-12-renderstats`. Then finally that branch will be merged into `birdhouse-build-master`. Branches originating from this repo that are merged in the current Kart repo may not be included in this list. -->
|
|
|
|
|
|
<!--- - `fkart-12-renderstats`: Merger branch (both branches touch timing code and conflict) --->
|
|
|
- `fkart-12`: Frame interpolation from fkart.
|
|
|
- `fkart`: Frame interpolation from fkart.
|
|
|
- `renderstats`: Various rendering stats for OpenGL and software renderers.
|
|
|
|
|
|
<!--- - `bh-ogl-merger`: Merger branch for various OpenGL additions that likely conflict -->
|
... | ... | |