Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

water flow fix from c55 #50

Open
wants to merge 987 commits into
base: master
Choose a base branch
from
Open

water flow fix from c55 #50

wants to merge 987 commits into from

Conversation

Oblomov
Copy link
Contributor

@Oblomov Oblomov commented Aug 3, 2011

based on speedprog's latest gettext fixes, merge those first

erlehmann and others added 30 commits July 21, 2011 15:40
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
Oblomov and others added 30 commits August 11, 2011 17:01
Marking *.cpp files as C++ files makes for nicer diffs when using
--color-words or similar options.
commands:
/#ipban <nick>
/#ipunban <ip>
Constify keycode and move the static array of localizable names from the
guiKeyChangeMenu header to the implementation file, changing its name.
When failing, no need to force the user to scroll up after a lot of
output, to find at what step exactly we failed (merges and builds can
generate a lot of text): just repeat the action.
These scripts should not be in the root but in util/ and in fact
they are, so let's get rid of these.
It's outdated, and it would be better to use cmake's packaging
capabilities instead, for better cross-platformness.
Conflicts:
	makepackage_binary.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants