src/frameworks · 9b9667f5e46fdc648d1e6cdf3f8832ce4ae5f9e4 · lifo / Nicolas Ollinger / OpenBoard · GitLab

History Find file

Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40 · 07ae1fd1
Anatoly Mihalchenko authored Jun 08, 2012
```
Conflicts:
	src/frameworks/UBPlatformUtils_linux.cpp
	src/frameworks/UBPlatformUtils_mac.mm
	src/frameworks/UBPlatformUtils_win.cpp
```
07ae1fd1

Name	Last commit	Last update
..
MacUtils.h		Loading commit data...
UBBase32.cpp		Loading commit data...
UBBase32.h		Loading commit data...
UBCoreGraphicsScene.cpp		Loading commit data...
UBCoreGraphicsScene.h		Loading commit data...
UBCryptoUtils.cpp		Loading commit data...
UBCryptoUtils.h		Loading commit data...
UBFileSystemUtils.cpp		Loading commit data...
UBFileSystemUtils.h		Loading commit data...
UBGeometryUtils.cpp		Loading commit data...
UBGeometryUtils.h		Loading commit data...
UBPlatformUtils.cpp		Loading commit data...
UBPlatformUtils.h		Loading commit data...
UBPlatformUtils_linux.cpp		Loading commit data...
UBPlatformUtils_mac.mm		Loading commit data...
UBPlatformUtils_win.cpp		Loading commit data...
UBStringUtils.cpp		Loading commit data...
UBStringUtils.h		Loading commit data...
UBVersion.cpp		Loading commit data...
UBVersion.h		Loading commit data...
frameworks.pri		Loading commit data...