Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

szarp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

2021268f

Commit 2021268f authored 14 years ago by Krzysztof Gałązka

Downloads
- Plain Diff

Merge branch 'master' of ssh://szarp.git.sourceforge.net/gitroot/szarp/szarp

Conflicts:
	ChangeLog

parents 98010367 98dd6792

No related branches found

Tags 3.1.520

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 0 deletions

ChangeLog
INSTALL.Windows 3 additions, 3 deletions

INSTALL.Windows
debian/changelog 6 additions, 0 deletions

debian/changelog
meaner3/utils/szbwriter.cc 19 additions, 11 deletions

meaner3/utils/szbwriter.cc
resources/documentation/new/ipk/ipk.sgml 5 additions, 3 deletions

resources/documentation/new/ipk/ipk.sgml
wx/common/biowxsock.cpp 1 addition, 1 deletion

wx/common/biowxsock.cpp

with 37 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment