Merge
0ae9b97936b0
Actions

Description

Merge

Details

Provenance

matthew	Authored on
matthew	Pushed on Thu, Mar 9, 10:28 AM

Parents

R1:2382ee72d260: AudioView unit tests.
R1:c996cf368db1: Build fix.

Branches

Unknown

Tags

Unknown

Event Timeline

matthew committed R1:0ae9b97936b0: Merge.Thu, Mar 9, 10:28 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

2382ee72d260 AudioView unit tests.
Author
matthew
Browse Repository
No Builds
No Audits
41a667f7745b Close old branch
Author
matthew
Browse Repository
No Builds
No Audits
448b13fcce05 Close old branch.
Author
matthew
Browse Repository
No Builds
No Audits
78380e9be877 Cocoa ARC impl.
Author
matthew
Browse Repository
No Builds
No Audits
718da24f8c85 Added GTK version to IDE about box.
Author
matthew
Browse Repository
No Builds
No Audits
266c3c2b0940 Create a stable GTK2 branch that can co-exist with the default GTK3 one.
Author
matthew
Browse Repository
No Builds
No Audits
28d6d67f2631 Speller fixes.
Author
matthew
Browse Repository
No Builds
No Audits
577f4eb03182 Crash fix in GdcAlpha32::Blt
Author
matthew
Browse Repository
No Builds
No Audits
7538dfbc2fab Back ported fixes?
Author
matthew
Browse Repository
No Builds
No Audits
e40f6cf31139 Branch: Scribe v2.1
Author
matthew
Browse Repository
No Builds
No Audits
c6d3aac5de15 Pop3 open fix.
Author
matthew
Browse Repository
No Builds
No Audits
5a5b83e93343 Build fixes.
Author
matthew
Browse Repository
No Builds
No Audits
e1effb9fa5d1 Back port speller fixes.
Author
matthew
Browse Repository
No Builds
No Audits
44e48f1f52d6 Build fixes for Scribe v2.2
Author
matthew
Browse Repository
No Builds
No Audits
ce1ef5f8ece6 Branch: Scribe v2.2
Author
matthew
Browse Repository
No Builds
No Audits
ae2227cfed30 Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
ac8e04678665 _DumpColour fix.
Author
matthew
Browse Repository
No Builds
No Audits
bb20b67231ad Mac build fixes.
Author
matthew
Browse Repository
No Builds
No Audits
3bd28b92d399 Fix for CSS crash.
Author
matthew
Browse Repository
No Builds
No Audits
8befbf1f332e Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
f2580e00cdd5 Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
752b72476df6 Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
e90170c51c91 Updated some things in the read me
Author
matthew
Browse Repository
No Builds
No Audits
e66a984a93a3 Escaping strings fix.
Author
matthew
Browse Repository
No Builds
No Audits
c76072bc1fce Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
6b1f9f472891 LgiRes changes.
Author
matthew
Browse Repository
No Builds
No Audits
efe74b7085c9 Changes from trunk...
Author
matthew
Browse Repository
No Builds
No Audits
506b39934455 File dialog now converts illegal file name chars to underscore.
Author
matthew
Browse Repository
No Builds
No Audits
b537fb305e60 Added string escape/unescape methods.
Author
matthew
Browse Repository
No Builds
No Audits
8e28db100c61 Build fix
Author
matthew
Browse Repository
No Builds
No Audits
b50a35a24471 Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
4d87d0b2c683 Merge branch 'v3.7' of https://github.com/memecode/Lgi into v3.7
Author
matthew
Browse Repository
No Builds
No Audits
dbdddf9d098e Menu fixes
Author
matthew
Browse Repository
No Builds
No Audits
8aaeee842ff6 Crash fix in MailIMap::WriteBuf
Author
matthew
Browse Repository
No Builds
No Audits
6a23b556e326 Linux menu changes
Author
matthew
Browse Repository
No Builds
No Audits
1679b1f348be Added code to save the cookie in imap's oauth impl
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
090c9d17bfb5 OAuth2 back port changes.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
94e1eb46bf72 Back port of OAUTH2 IMAP authentication.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
22360da3b5aa Fix IMAP auth plain bug.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
cb508b297b7f Linux charset fixes
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
b55beb1d1525 Back porting unicode fixes from trunk.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
50aae8b15f3e Added fallbacks for file open / save dialogs.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
ac380c600b80 Making manifest the same for multiple projects.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
ef429e1cde76 Fixed uninitialised Minimum scrollbar value.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
0309e197ec2c Linux build fixes
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
c35fab042811 Fixed updater project output paths.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
e0eb458c607e Changes from trunk.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
5a473509c25e Zoom view fixes.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
d4cba139ed5d Added SSL socket logging.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits
6d347f8d75b6 GDir buffer len.
Author
fret <fret@512b8609-1b42-4b4d-9cba-0f29db37ec81>
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

Ide/

Code/

include/

lgi/

common/

Html.h

src/

common/

Text/

TextView3.cpp

Widgets/

Edit.cpp

mac/

cocoa/

File.mm

General.mm

R1:0ae9b97936b0

View Options

Ide/Code/FindSymbol.cpp

View Options

Ide/Code/IdeDoc.cpp

View Options

Ide/Code/LgiIde.cpp

View Options

Ide/Code/SimpleCppParser.cpp

View Options

include/lgi/common/Html.h

View Options

src/common/Text/TextView3.cpp

View Options

src/common/Widgets/Edit.cpp

View Options

src/mac/cocoa/File.mm

View Options

Merge0ae9b97936b0Actions

Description

Details

Event Timeline

Merged Changes

Changes (9)

R1:0ae9b97936b0

Ide/Code/FindSymbol.cpp

Ide/Code/IdeDoc.cpp

Ide/Code/LgiIde.cpp

Ide/Code/SimpleCppParser.cpp

include/lgi/common/Html.h

src/common/Text/TextView3.cpp

src/common/Widgets/Edit.cpp

src/mac/cocoa/File.mm

src/mac/cocoa/General.mm

Merge
0ae9b97936b0
Actions