search

ltfat / libltfat

Backend library for LTFAT
http://ltfat.github.io/libltfat
GNU General Public License v3.0
12 stars 2 forks source link

Ultimatelly find a way how to merge ltfatcompat and master #5

Closed susnak closed 8 years ago

susnak commented 8 years ago

In ltfatcompat, we keep some ltfat specific build options which we obviously do not want to have in a general purpose library. Find a way how to get rid of that.

susnak commented 8 years ago

Until then, we will do cherry-picking instead of merges. Please do the build logic changes and the code changes in separate commits.

susnak commented 8 years ago

master and ltfatcompat can now merge each other as usual. The build specific stuff is listed in .gitattributes to use "ours" merge strategy.

susnak commented 8 years ago

master and ltfatcompat have been merged.