Fri, 02 Dec 2016 17:48:26 +0300make about dialog on Windows not so big
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 02 Dec 2016 17:48:26 +0300] rev 1589
make about dialog on Windows not so big


It was automatically expanded to place description in one line.

Thu, 01 Dec 2016 18:31:10 +0300update Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 01 Dec 2016 18:31:10 +0300] rev 1588
update Russian translation

Thu, 01 Dec 2016 18:30:34 +0300add i18n to PLC status
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 01 Dec 2016 18:30:34 +0300] rev 1587
add i18n to PLC status

Extra strings are added to the code to make mki18n.py to find these
strings in source files and put them into i18n/messages.pot.

Thu, 01 Dec 2016 16:59:16 +0300remove clear and reset execution order buttons in popup menu in SFC and LD viewers.
Sergey Surkov <surkovsv93@gmail.com> [Thu, 01 Dec 2016 16:59:16 +0300] rev 1586
remove clear and reset execution order buttons in popup menu in SFC and LD viewers.

Thu, 01 Dec 2016 16:52:28 +0300fix initial(equal to the min) number of sequences in SFC Divergence dialog.
Sergey Surkov <surkovsv93@gmail.com> [Thu, 01 Dec 2016 16:52:28 +0300] rev 1585
fix initial(equal to the min) number of sequences in SFC Divergence dialog.

Thu, 01 Dec 2016 16:40:49 +0300make only correct blocks(by IEC 61131-3 standard) available in wire popup menu in SFC Viewer
Sergey Surkov <surkovsv93@gmail.com> [Thu, 01 Dec 2016 16:40:49 +0300] rev 1584
make only correct blocks(by IEC 61131-3 standard) available in wire popup menu in SFC Viewer

Wed, 30 Nov 2016 14:27:18 +0300move EnhancedStatusBar.py to the right location
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 30 Nov 2016 14:27:18 +0300] rev 1583
move EnhancedStatusBar.py to the right location

Tue, 29 Nov 2016 11:41:09 +0300add internatialization support to startup messages during checking software updates
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 29 Nov 2016 11:41:09 +0300] rev 1582
add internatialization support to startup messages during checking software updates

Mon, 28 Nov 2016 16:47:01 +0300fix translation strings with multiple parameters
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 28 Nov 2016 16:47:01 +0300] rev 1581
fix translation strings with multiple parameters


this fixes a lot of warnings given by msgmerge:

../PLCOpenEditor.py:196: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
The translator cannot reorder the arguments.
Please consider using a format string with named arguments,

Mon, 28 Nov 2016 16:27:24 +0300change bug report address for PLCOpenEditor to beremiz-devel@lists.sourceforge.net
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 28 Nov 2016 16:27:24 +0300] rev 1580
change bug report address for PLCOpenEditor to beremiz-devel@lists.sourceforge.net

make error message to be the same as in Beremiz IDE

Mon, 28 Nov 2016 16:12:27 +0300fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 28 Nov 2016 16:12:27 +0300] rev 1579
fix segmentation fault on clicking red point in compilation console if that compilation error coverts several units in plcopen file

closes #11

Thu, 24 Nov 2016 18:33:56 +0300add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 24 Nov 2016 18:33:56 +0300] rev 1578
add localization to time strings in DebugVariablePanel and to dialog shown after variable drag'n'drop

Thu, 24 Nov 2016 15:46:17 +0300fix issue that if located variable was dropped in location column, then address was changed in wrong row (row - 1).
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 24 Nov 2016 15:46:17 +0300] rev 1577
fix issue that if located variable was dropped in location column, then address was changed in wrong row (row - 1).

It's not neccessary to carry about label size. YToRow() does the work.

Thu, 24 Nov 2016 15:37:03 +0300increase size for time buttons in LogViewer
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 24 Nov 2016 15:37:03 +0300] rev 1576
increase size for time buttons in LogViewer

The buttons are slightly bigger now. This gives more space for label
translations in other languages.
closes #12

Thu, 24 Nov 2016 13:17:06 +0300don't rebuild the makefile based project if only companyName, projectName or productName are changed
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 24 Nov 2016 13:17:06 +0300] rev 1575
don't rebuild the makefile based project if only companyName, projectName or productName are changed

And this fix current encoding issues, because all these information fields can
contain non-latin characters.

Tue, 22 Nov 2016 18:42:48 +0300add progress bar to status bar
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 22 Nov 2016 18:42:48 +0300] rev 1574
add progress bar to status bar

It can be used to display progress during program upload.
To use it call ShowPLCProgress (like ShowPLCProgress("transfered",
10)) in your PLCObject implementation.

Sat, 19 Nov 2016 23:42:49 +0100fix warning: 'return' with no value in function startPLC
ctbenergy <ewald.weinahndl@gmail.com> [Sat, 19 Nov 2016 23:42:49 +0100] rev 1573
fix warning: 'return' with no value in function startPLC

Sat, 19 Nov 2016 22:20:19 +0100fix inconsistent whitespace
ctbenergy <ewald.weinahndl@gmail.com> [Sat, 19 Nov 2016 22:20:19 +0100] rev 1572
fix inconsistent whitespace

Fri, 18 Nov 2016 13:57:42 +0300fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 18 Nov 2016 13:57:42 +0300] rev 1571
fix license notices in source files and license files under GPLv2+

Previously a lot of files were referenced to GNU Public License 2.1,
which never existed.
All copyright attributions are kept the same.

Thu, 17 Nov 2016 22:57:20 +0300fix PLC autostart option for Beremiz_service.py
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 17 Nov 2016 22:57:20 +0300] rev 1570
fix PLC autostart option for Beremiz_service.py

Thu, 17 Nov 2016 22:41:41 +0300remove old debug code
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 17 Nov 2016 22:41:41 +0300] rev 1569
remove old debug code

Thu, 17 Nov 2016 14:11:48 +0300fix wrong font family in CustromGrid control
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 17 Nov 2016 14:11:48 +0300] rev 1568
fix wrong font family in CustromGrid control

closes #10

Thu, 17 Nov 2016 14:04:44 +0300now only correct chart can be created in SFC Viewer
Sergey Surkov <surkovsv93@gmail.com> [Thu, 17 Nov 2016 14:04:44 +0300] rev 1567
now only correct chart can be created in SFC Viewer

if user trying to connect incompatible blocks (by IEC 61131-3 standard), wire highlight will become red

Thu, 17 Nov 2016 13:48:36 +0300add Russian translations for About dialogs
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 17 Nov 2016 13:48:36 +0300] rev 1566
add Russian translations for About dialogs

Thu, 17 Nov 2016 13:48:04 +0300make about dialog boxes use standard wx about dialogs
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 17 Nov 2016 13:48:04 +0300] rev 1565
make about dialog boxes use standard wx about dialogs

Any information in dialog can be easily changed without much effort
and the dialog can be easy translated.

Unfortunately on Windows there is no good standard about dialog,
therefore own implementation is used there.

Tue, 08 Nov 2016 18:14:30 +0300fix highlighting error and warning messages with non-lating characters
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 08 Nov 2016 18:14:30 +0300] rev 1564
fix highlighting error and warning messages with non-lating characters

Tue, 08 Nov 2016 18:06:30 +0300fix breaking non-latin description and comments in FBD, LD, SFC and
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 08 Nov 2016 18:06:30 +0300] rev 1563
fix breaking non-latin description and comments in FBD, LD, SFC and
project settings after Undo operation

Wed, 02 Nov 2016 14:23:24 +0300fix borders of pull-down choice list box in Config tab, in Project Properties
Sergey Surkov <surkovsv93@gmail.com> [Wed, 02 Nov 2016 14:23:24 +0300] rev 1562
fix borders of pull-down choice list box in Config tab, in Project Properties

Tue, 01 Nov 2016 14:44:22 +0300add version.py needed for previous commit '4ce8492'
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 01 Nov 2016 14:44:22 +0300] rev 1561
add version.py needed for previous commit '4ce8492'

Tue, 01 Nov 2016 14:03:14 +0300add version with commit hash to 'About' dialogs for Beremiz IDE and PLCOpenEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 01 Nov 2016 14:03:14 +0300] rev 1560
add version with commit hash to 'About' dialogs for Beremiz IDE and PLCOpenEditor

Mon, 31 Oct 2016 13:59:56 +0300ignore generated bugreports and output of i18n script
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 31 Oct 2016 13:59:56 +0300] rev 1559
ignore generated bugreports and output of i18n script

Fri, 28 Oct 2016 18:28:10 +0300now dialogs Find and Search in Project can be closed with ESC button
Sergey Surkov <surkovsv93@gmail.com> [Fri, 28 Oct 2016 18:28:10 +0300] rev 1558
now dialogs Find and Search in Project can be closed with ESC button

Fri, 28 Oct 2016 18:17:35 +0300fix russian translation of "direction" in Find dialog
Sergey Surkov <surkovsv93@gmail.com> [Fri, 28 Oct 2016 18:17:35 +0300] rev 1557
fix russian translation of "direction" in Find dialog

Fri, 28 Oct 2016 18:11:43 +0300fix major bugs in Find and Search in Project functionality.
Sergey Surkov <surkovsv93@gmail.com> [Fri, 28 Oct 2016 18:11:43 +0300] rev 1556
fix major bugs in Find and Search in Project functionality.

fix case sensitive and regexp search, remove duplicating code

Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>

Fri, 28 Oct 2016 17:21:42 +0300fix issue with non-updated button 'generated IECCode' after Build and Clean
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 28 Oct 2016 17:21:42 +0300] rev 1555
fix issue with non-updated button 'generated IECCode' after Build and Clean

Thu, 27 Oct 2016 17:07:44 +0300increase dialog size for edit SFC transition, so buttons are visible
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 27 Oct 2016 17:07:44 +0300] rev 1554
increase dialog size for edit SFC transition, so buttons are visible

Thu, 27 Oct 2016 16:24:13 +0300fix issue that sometimes period for cyclic task wasn't saved.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 27 Oct 2016 16:24:13 +0300] rev 1553
fix issue that sometimes period for cyclic task wasn't saved.

This is complete fix for the problem described in 8626bba.

Thu, 27 Oct 2016 15:31:43 +0300add first steps example, that shows how use all IEC 61131 languages
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 27 Oct 2016 15:31:43 +0300] rev 1552
add first steps example, that shows how use all IEC 61131 languages

Wed, 26 Oct 2016 19:13:26 +0300fix issue with empty frame with generated ST code
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 26 Oct 2016 19:13:26 +0300] rev 1551
fix issue with empty frame with generated ST code

Wed, 26 Oct 2016 15:51:20 +0300fix not saving location address from variable panel
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 26 Oct 2016 15:51:20 +0300] rev 1550
fix not saving location address from variable panel

this regression was introduced by commit 3518d10

Mon, 24 Oct 2016 18:02:53 +0300add $(Beremiz installation)/mingw/bin in PATH on Windows platform
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 24 Oct 2016 18:02:53 +0300] rev 1549
add $(Beremiz installation)/mingw/bin in PATH on Windows platform

This fixes issue if multiple gcc installation are found in user's
PATH. Now gcc from Beremiz is used by default.

Fri, 21 Oct 2016 13:06:31 +0300fix issue with non-working global hotkeys in IEC code panel
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 21 Oct 2016 13:06:31 +0300] rev 1548
fix issue with non-working global hotkeys in IEC code panel

Thu, 20 Oct 2016 14:45:27 +0300add more comments to svgui example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 20 Oct 2016 14:45:27 +0300] rev 1547
add more comments to svgui example

Thu, 20 Oct 2016 14:45:11 +0300cleanup traffic lights example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 20 Oct 2016 14:45:11 +0300] rev 1546
cleanup traffic lights example

Wed, 19 Oct 2016 16:32:10 +0300cleanup svgui example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 19 Oct 2016 16:32:10 +0300] rev 1545
cleanup svgui example

Tue, 18 Oct 2016 17:44:08 +0300Fix bug with two or more wires connected to one input. Now only one wire can be connected to one input, except BOOLean signals in LD and SFC. If user trying to connect wire with already connected input, wire highlight will become red.
Sergey Surkov <surkovsv93@gmail.com> [Tue, 18 Oct 2016 17:44:08 +0300] rev 1544
Fix bug with two or more wires connected to one input. Now only one wire can be connected to one input, except BOOLean signals in LD and SFC. If user trying to connect wire with already connected input, wire highlight will become red.
Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>

Fri, 14 Oct 2016 18:04:22 +0300fix issue with sequence of multiple whitespaces in makefile command
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 14 Oct 2016 18:04:22 +0300] rev 1543
fix issue with sequence of multiple whitespaces in makefile command
line from project configuration

for every additional whitespace '""' was inserted in result command line.

Fri, 14 Oct 2016 14:03:38 +0300fix minor issue and do some cleanup work in genericmake example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 14 Oct 2016 14:03:38 +0300] rev 1542
fix minor issue and do some cleanup work in genericmake example

Wed, 12 Oct 2016 17:53:18 +0300cleanup python example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 12 Oct 2016 17:53:18 +0300] rev 1541
cleanup python example

Thu, 06 Oct 2016 11:30:04 +0300complete fix in commit 3518d10 for wxgtk2.8
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 06 Oct 2016 11:30:04 +0300] rev 1540
complete fix in commit 3518d10 for wxgtk2.8

Wed, 05 Oct 2016 18:11:52 +0300fix syncronization issue during killing ProcessLoggers on IDE close
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 05 Oct 2016 18:11:52 +0300] rev 1539
fix syncronization issue during killing ProcessLoggers on IDE close

Wed, 05 Oct 2016 18:01:28 +0300Add russian translation on label "Tick" in debug variable panel.
Sergey Surkov <surkovsv93@gmail.com> [Wed, 05 Oct 2016 18:01:28 +0300] rev 1538
Add russian translation on label "Tick" in debug variable panel.

Wed, 05 Oct 2016 10:07:10 +0300Add russian language in Project properties -> Other menu.
Sergey Surkov <surkovsv93@gmail.com> [Wed, 05 Oct 2016 10:07:10 +0300] rev 1537
Add russian language in Project properties -> Other menu.

Tue, 04 Oct 2016 18:01:08 +0300fix issue, that was impossible to change variable location IEC-address, when wx 3.0 is used
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 04 Oct 2016 18:01:08 +0300] rev 1536
fix issue, that was impossible to change variable location IEC-address, when wx 3.0 is used

Tue, 04 Oct 2016 17:43:30 +0300Merge
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 04 Oct 2016 17:43:30 +0300] rev 1535
Merge

Tue, 04 Oct 2016 17:26:38 +0300fix infinite recursion in 'Reset Execution Order' functionality if FBD body contains feedback connections
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 04 Oct 2016 17:26:38 +0300] rev 1534
fix infinite recursion in 'Reset Execution Order' functionality if FBD body contains feedback connections

Tue, 13 Sep 2016 21:42:11 +0300fix issues in PLCOpenEditor with moving from wxWidgets 2.8 to 3.0
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 13 Sep 2016 21:42:11 +0300] rev 1533
fix issues in PLCOpenEditor with moving from wxWidgets 2.8 to 3.0

1)
./PLCOpenEditor.py:63: wxPyDeprecationWarning: Using deprecated class PySimpleApp.
app = wx.PySimpleApp()

2)
./PLCOpenEditor.py:475: wxPyDeprecationWarning: Call to deprecated item.
wx.InitAllImageHandlers()

3)
Traceback (most recent call last):
File "./PLCOpenEditor.py", line 480, in <module>
frame = PLCOpenEditor(None, fileOpen=fileOpen)
File "./PLCOpenEditor.py", line 163, in __init__
IDEFrame.__init__(self, parent)
File "/tmp/f/beremiz/IDEFrame.py", line 657, in __init__
self._init_ctrls(parent)
File "/tmp/f/beremiz/IDEFrame.py", line 485, in _init_ctrls
self._init_icon(prnt)
File "/tmp/f/beremiz/IDEFrame.py", line 476, in _init_icon
if self.icon:
AttributeError: 'PLCOpenEditor' object has no attribute 'icon'

Mon, 12 Sep 2016 16:49:24 +0300update messages and add Russian translation for new menu entry 'switch perspective'
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 12 Sep 2016 16:49:24 +0300] rev 1532
update messages and add Russian translation for new menu entry 'switch perspective'

Mon, 12 Sep 2016 16:46:09 +0300Merged in Surkovsv/beremiz (pull request #4)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 12 Sep 2016 16:46:09 +0300] rev 1531
Merged in Surkovsv/beremiz (pull request #4)

Add hotkey (F12) for switching perspective.

Mon, 12 Sep 2016 16:41:21 +0300Add hotkey (F12) for switching perspective.
Sergey Surkov <surkovsv93@gmail.com> [Mon, 12 Sep 2016 16:41:21 +0300] rev 1530
Add hotkey (F12) for switching perspective.

Switching perspective feature hides/restores all panels except of the main editor window for current FB.
So all available screen space is used for editor.

Mon, 12 Sep 2016 10:15:39 +0500Merged skvorl/beremiz into default
Paul Beltyukov <beltyukov.p.a@gmail.com> [Mon, 12 Sep 2016 10:15:39 +0500] rev 1529
Merged skvorl/beremiz into default

Sat, 10 Sep 2016 11:19:40 +0500Fixed crash when starts on OS X with wxPython 3.0.x
alexander@macbook-pro-alexander.local [Sat, 10 Sep 2016 11:19:40 +0500] rev 1528
Fixed crash when starts on OS X with wxPython 3.0.x

Fri, 09 Sep 2016 11:47:00 +0500Merged skvorl/beremiz into default
Paul Beltyukov <beltyukov.p.a@gmail.com> [Fri, 09 Sep 2016 11:47:00 +0500] rev 1527
Merged skvorl/beremiz into default

Fri, 26 Aug 2016 10:20:14 +0500Added .idea dir to ignore.
alexander.shaykhrazeev@gmail.com <alexander.shaykhrazeev@gmail.com> [Fri, 26 Aug 2016 10:20:14 +0500] rev 1526
Added .idea dir to ignore.

Fri, 09 Sep 2016 17:57:36 +0300cleanup logging example
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 17:57:36 +0300] rev 1525
cleanup logging example

add comments, rename variables, some rework for algorithm

Fri, 09 Sep 2016 17:53:32 +0300fix non-working logging at first connection to PLC after Beremiz launch
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 17:53:32 +0300] rev 1524
fix non-working logging at first connection to PLC after Beremiz launch

At the same time this helps to avoid exception described in 1484:d5efbb20927e.

Fri, 09 Sep 2016 13:39:24 +0300Merged in Surkovsv/beremiz (pull request #2)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 09 Sep 2016 13:39:24 +0300] rev 1523
Merged in Surkovsv/beremiz (pull request #2)

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

Fri, 09 Sep 2016 13:33:49 +0300fix bug with non-editable names and types of FB local variables in POU's written in ST or IL
Sergey Surkov <surkovsv93@gmail.com> [Fri, 09 Sep 2016 13:33:49 +0300] rev 1522
fix bug with non-editable names and types of FB local variables in POU's written in ST or IL

Mon, 05 Sep 2016 16:47:34 +0300fix highlighting input/outputs in function call in ST, if comment section is placed
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 05 Sep 2016 16:47:34 +0300] rev 1521
fix highlighting input/outputs in function call in ST, if comment section is placed
inside call.

For example:

PackOutputs(
W4 := OUT1,
W5 := OUT2,
W6 := OUT3,
W7 := OUT4,
W8 := OUT5 (* comment inside call *),
W9 := OUT6,
W10 := OUT7,
W11 := OUT8);

Wed, 24 Aug 2016 13:08:13 +0300add initialization tick time on Beremiz start
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:08:13 +0300] rev 1520
add initialization tick time on Beremiz start

This fixes issue #6

Wed, 24 Aug 2016 13:06:52 +0300fix race condition in ProcessLogger
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 24 Aug 2016 13:06:52 +0300] rev 1519
fix race condition in ProcessLogger

Tue, 23 Aug 2016 10:24:47 +0500- Fixed startup from ancestor code.
alexander@60.125.16.172.in-addr.arpa [Tue, 23 Aug 2016 10:24:47 +0500] rev 1518
- Fixed startup from ancestor code.

Thu, 18 Aug 2016 14:35:03 +0500This fixes issue #5
Paul Beltyukov [Thu, 18 Aug 2016 14:35:03 +0500] rev 1517
This fixes issue #5

Fri, 06 May 2016 22:21:22 +0300fix bug: Beremiz IDE hangs during launching Beremiz_service
andrey@new-nest [Fri, 06 May 2016 22:21:22 +0300] rev 1516
fix bug: Beremiz IDE hangs during launching Beremiz_service

this is regression introduced as side effect by d7f474d [fix issue
with sometimes wrong return code of ProcessLogger]

Fri, 06 May 2016 19:14:10 +0300automatically detect flags supported by matiec and find correct path
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 19:14:10 +0300] rev 1515
automatically detect flags supported by matiec and find correct path
for matiec C library files

This makes possible to use an old matiec and the new one.

Fri, 06 May 2016 18:04:40 +0300fix bug that appears if datatype in the project tree is renamed to wrong name (keyword, existend type,...)
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 18:04:40 +0300] rev 1514
fix bug that appears if datatype in the project tree is renamed to wrong name (keyword, existend type,...)

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/lib/expando.py", line 126, in _adjustCtrl
numLines = self.GetNumberOfLines()
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 16710, in __getattr__
raise PyDeadObjectError(self.attrStr % self._name)
PyDeadObjectError: The C++ part of the TreeTextCtrl object has been deleted, attribute access no longer allowed.

Fri, 06 May 2016 16:16:30 +0300add distribution license notice to about dialog as GPL requires
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 16:16:30 +0300] rev 1513
add distribution license notice to about dialog as GPL requires

Fri, 06 May 2016 14:45:06 +0300add GPLv2 license
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:45:06 +0300] rev 1512
add GPLv2 license

Fri, 06 May 2016 14:05:44 +0300add copyright notices to python files where there were missing, that
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 14:05:44 +0300] rev 1511
add copyright notices to python files where there were missing, that
is required by GPLv2

Fri, 06 May 2016 10:35:46 +0300fix issue that was impossible to remove local instance of functional
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 06 May 2016 10:35:46 +0300] rev 1510
fix issue that was impossible to remove local instance of functional
block if pou is written in ST or IL

Thu, 28 Apr 2016 16:54:01 +0300fix highlighting of multiline comments in ST and IL
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 16:54:01 +0300] rev 1509
fix highlighting of multiline comments in ST and IL

close #2

Thu, 28 Apr 2016 15:21:02 +0300fix error if non-latin character was entered in initial value in
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 15:21:02 +0300] rev 1508
fix error if non-latin character was entered in initial value in
data type element

Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 575, in OnStructureElementsGridCellChange
value = self.StructureElementsTable.GetValue(row, col)
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)
Traceback (most recent call last):
File "/home/beremiz/editors/DataTypeEditor.py", line 80, in GetValue
return str(value)
UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)

Thu, 28 Apr 2016 13:05:57 +0300fix issue with sometimes wrong return code of ProcessLogger
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 13:05:57 +0300] rev 1507
fix issue with sometimes wrong return code of ProcessLogger


As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list

The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.

Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.

Thu, 28 Apr 2016 12:58:58 +0300Fix error about missing attribute 'timeout' that happens sometimes during compilation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 28 Apr 2016 12:58:58 +0300] rev 1506
Fix error about missing attribute 'timeout' that happens sometimes during compilation

The fix [1476:49f1763a5613] of the problem with following trace was wrong.
Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'
The problem was that compilation process was finished before the timeout attribute is set.
Now timeout is set before launcing of compilation process.

Wed, 27 Apr 2016 18:42:30 +0300fix copying elements with non-latin content like comment element, or
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 27 Apr 2016 18:42:30 +0300] rev 1505
fix copying elements with non-latin content like comment element, or
variables with description in non-latin character set

before any non-latin text was converted after copying to strings like '&#1069;&#1090;&#1086;...'

Mon, 25 Apr 2016 17:23:04 +0300fix issue that if functional block is dragged from project panel into
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 25 Apr 2016 17:23:04 +0300] rev 1504
fix issue that if functional block is dragged from project panel into
ST text editor and in dialog 'Please enter a block name' button
'cancel' is pressed, despite of cancel text about drag'n'dropped type
is pasted in ST program.

Fri, 22 Apr 2016 21:26:31 +0300fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 21:26:31 +0300] rev 1503
fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]

Variable matiec_flags in c_ext.py and PythonFileCTNMixin.py is not
used for flags for matiec (IEC to C compiler) actually, but it's used
to compile C-code generated for extensions using normal C-compiler,
like gcc.

Fri, 22 Apr 2016 19:49:10 +0300fix display of ARRAY fields inside of structure data types.
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 19:49:10 +0300] rev 1502
fix display of ARRAY fields inside of structure data types.

Previously ARRAY fields in structures were displayed, for example,
like 'ARRAY [1..2] OF ARRAY' instead of 'ARRAY [1..2] OF INT'. Because
of this error the array type can be really edited.

Fri, 22 Apr 2016 17:02:18 +0300fix Traceback if search icon on library panel is clicked, when no
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 17:02:18 +0300] rev 1501
fix Traceback if search icon on library panel is clicked, when no
category/item is selected in the library.

The problem is here, that if nothing is selected method GetSelection()
returns root item, that doesn't have any python data associated with it.
This issue seems to be wx3.0 specified, because it doesn't exist
with wx2.8 on Windows.

Fri, 22 Apr 2016 16:59:47 +0300update Russian about Beremiz dialog window
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 16:59:47 +0300] rev 1500
update Russian about Beremiz dialog window

Fri, 22 Apr 2016 16:24:06 +0300fix issue, that was impossible to change time interval for cyclic
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Fri, 22 Apr 2016 16:24:06 +0300] rev 1499
fix issue, that was impossible to change time interval for cyclic
tasks, when wx 3.0 is used

Thu, 21 Apr 2016 20:42:37 +0300fix deprecation warnings about accessing properties m_x, m_y of wxKeyEvent
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 20:42:37 +0300] rev 1498
fix deprecation warnings about accessing properties m_x, m_y of wxKeyEvent

/home/beremiz/beremiz/controls/PouInstanceVariablesPanel.py:354: wxPyDeprecationWarning: Accessing deprecated property.
event.m_x = size.width / 2

Thu, 21 Apr 2016 19:14:28 +0300fix set_color_cycle from matplotlib deprecation warning
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 19:14:28 +0300] rev 1497
fix set_color_cycle from matplotlib deprecation warning

/usr/lib/python2.7/dist-packages/matplotlib/cbook.py:137: MatplotlibDeprecationWarning: The set_color_cycle attribute was deprecated in version 1.5. Use set_prop_cycle instead.
warnings.warn(message, mplDeprecation, stacklevel=1)

Thu, 21 Apr 2016 17:51:29 +0300update Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:51:29 +0300] rev 1496
update Russian translation

Thu, 21 Apr 2016 17:49:39 +0300add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:49:39 +0300] rev 1495
add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor

Thu, 21 Apr 2016 17:47:35 +0300fix wrong Row number in DiscoveryDialog.py that caused following traceback:
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:47:35 +0300] rev 1494
fix wrong Row number in DiscoveryDialog.py that caused following traceback:

Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1536, in _Connect
dialog = DiscoveryDialog(self.AppFrame)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 124, in __init__
self._init_ctrls(parent)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 121, in _init_ctrls
self._init_sizers()
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 73, in _init_sizers
self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
File "/home/beremiz/beremiz/dialogs/DiscoveryDialog.py", line 64, in _init_coll_ButtonGridSizer_Growables
parent.AddGrowableRow(1)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_core.py", line 15343, in AddGrowableRow
return _core_.FlexGridSizer_AddGrowableRow(*args, **kwargs)
PyAssertionError: C++ assertion "!m_rows || idx < (size_t)m_rows" failed at ../src/common/sizer.cpp(1967) in AddGrowableRow(): invalid row index

Thu, 21 Apr 2016 17:44:17 +0300increase height of some dialog windows so they have enough space for buttons
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:44:17 +0300] rev 1493
increase height of some dialog windows so they have enough space for buttons

Thu, 21 Apr 2016 17:41:43 +0300add translation into Russian for dialog window "About PLCOpen Editor"
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:41:43 +0300] rev 1492
add translation into Russian for dialog window "About PLCOpen Editor"

Thu, 21 Apr 2016 17:40:52 +0300add translation of "about" window into Russian
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Thu, 21 Apr 2016 17:40:52 +0300] rev 1491
add translation of "about" window into Russian

Wed, 20 Apr 2016 17:30:16 +0300make About and Find dialogs have the same icon as main Beremiz window
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 17:30:16 +0300] rev 1490
make About and Find dialogs have the same icon as main Beremiz window

all child windows will take the parent's icon, if no other is specified.

Wed, 20 Apr 2016 17:15:35 +0300fix splash loading with wx3.0
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 17:15:35 +0300] rev 1489
fix splash loading with wx3.0

Previously only gray square was shown. Apparently to show splash screen several calls of wx.Yield() are necessary.
Unfortunately splash.IsShowOnScreen() returns always 1 regardless of whether splash is on the screen or not.
this fix is a dirty hack. It just process all events after splash is created during 0.3 seconds.

Wed, 20 Apr 2016 16:20:53 +0300add i18n for couple of strings in TextViewer.py
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 16:20:53 +0300] rev 1488
add i18n for couple of strings in TextViewer.py
add source file for Russian translation
update messages.pot and app.fil
update Russian translation

Wed, 20 Apr 2016 16:14:25 +0300increase height for ConnectionDialog and ArrayTypeDialog to have
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Wed, 20 Apr 2016 16:14:25 +0300] rev 1487
increase height for ConnectionDialog and ArrayTypeDialog to have
enough place for buttons

Tue, 19 Apr 2016 13:18:21 +0300add Russian translation
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 13:18:21 +0300] rev 1486
add Russian translation

Tue, 19 Apr 2016 12:16:29 +0300bitmap in wx3.0 doesn't have useAlpha() method
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 12:16:29 +0300] rev 1485
bitmap in wx3.0 doesn't have useAlpha() method

Tue, 19 Apr 2016 12:15:51 +0300Suppress WXDEBUG assertions, as happens by default with wx2.8. This is
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Tue, 19 Apr 2016 12:15:51 +0300] rev 1484
Suppress WXDEBUG assertions, as happens by default with wx2.8. This is
necessary for wx3.0

Exception while connecting LOCAL://!
Traceback (most recent call last):
File "/home/beremiz/beremiz/ProjectController.py", line 1560, in _Connect
self._SetConnector(connectors.ConnectorFactory(uri, self))
File "/home/beremiz/beremiz/ProjectController.py", line 1508, in _SetConnector
self.StatusTimer.Start(milliseconds=500, oneShot=False)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_misc.py", line 1324, in Start
return _misc_.Timer_Start(*args, **kwargs)
PyAssertionError: C++ assertion "m_window" failed at ../src/gtk/dcclient.cpp(2043) in DoGetSize(): GetSize() doesn't work without window

Mon, 18 Apr 2016 19:18:11 +0300enable use of wxWidgets-3.0
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:18:11 +0300] rev 1483
enable use of wxWidgets-3.0

Mon, 18 Apr 2016 19:17:22 +0300make mki18n.py wx-3.0 compatible and fix segmentation fault
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:17:22 +0300] rev 1482
make mki18n.py wx-3.0 compatible and fix segmentation fault

$ python mki18n.py -m -v --moTarget=../locale --domain=Beremiz
No project directory given. Using current one: /home/beremiz/beremiz/i18n
Application domain used is: 'Beremiz'
Target directory for .mo files is: ../locale
../src/common/stdpbase.cpp(62): assert "traits" failed in Get(): create wxApp before calling this
Segmentation fault

Mon, 18 Apr 2016 19:15:55 +0300fix issue, then it wasn't possible to view FBD programs
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:15:55 +0300] rev 1481
fix issue, then it wasn't possible to view FBD programs

the reason for that is possible wx-3.0-gtk2 bug that happens if
ALWAYS_SHOW_SB is set.

Traceback (most recent call last):
File "Beremiz.py", line 1045, in OnProjectTreeItemActivated
IDEFrame.OnProjectTreeItemActivated(self, event)
File "IDEFrame.py", line 1667, in OnProjectTreeItemActivated
self.EditProjectElement(item_infos["type"], item_infos["tagname"])
File "IDEFrame.py", line 1752, in EditProjectElement
new_window = Viewer(self.TabsOpened, tagname, self, self.Controler)
File "editors/Viewer.py", line 611, in __init__
EditorPanel.__init__(self, parent, tagname, window, controler, debug)
File "editors/EditorPanel.py", line 68, in __init__
self._init_ctrls(parent)
File "editors/EditorPanel.py", line 52, in _init_ctrls
self._init_Editor(self)
File "editors/Viewer.py", line 603, in _init_Editor
style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB)
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk2/wx/_windows.py", line 296, in __init__
_windows_.ScrolledWindow_swiginit(self,_windows_.new_ScrolledWindow(*args, **kwargs))
PyAssertionError: C++ assertion "scrolled" failed at ../src/gtk/scrolwin.cpp(205) in DoShowScrollbars(): window must be created

Mon, 18 Apr 2016 19:08:29 +0300fix issue, then it wasn't possible to remove functional blocks from
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 19:08:29 +0300] rev 1480
fix issue, then it wasn't possible to remove functional blocks from
project using right click and popup menu.

The problem is that, PopupMenu was called using IDEFrame object and as
a result item in ProjectTree loosed focus and focus went to IDEFrame.
Therefore later functions couldn't detect which item in ProjectTree
was selected.

Mon, 18 Apr 2016 18:59:11 +0300fix many compilation warnings about static variables used by non-static functions
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:59:11 +0300] rev 1479
fix many compilation warnings about static variables used by non-static functions

[CC] plc_main.c -> plc_main.o
/tmp/be/build/plc_main.c:396:40: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy((char*)buf + remaining, LogBuff[level], size - remaining);
^
/tmp/be/build/plc_main.c:395:22: warning: ?LogBuff? is static but used in inline function ?copy_from_log? which is not static
memcpy(buf, &LogBuff[level][buffpos], remaining);
^
...

^
/tmp/be/build/plc_debugger.c:825:20: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
Retain(retain_offset, size, real_value_p);
^
/tmp/be/build/plc_debugger.c:823:47: warning: ?retain_offset? is static but used in inline function ?BufferIterator? which is not static
unsigned int next_retain_offset = retain_offset + size;
^
^

Mon, 18 Apr 2016 18:56:51 +0300make attribute CFLAGS and LDFLAGS optional and add default empty value
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:56:51 +0300] rev 1478
make attribute CFLAGS and LDFLAGS optional and add default empty value

Actually CFLAGS and LDFLAGS are not required and can be empty.
Without default empty value if target platform in project settings was
set to "Linux" CFLAGS and LDFLAGS was initialized with NoneType.
The result was broken build and it wasn't to save/load project with
such settings.

Traceback (most recent call last):
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 956, in _Build
if not builder.build() :
File "/home/developer/WorkData/PLC/beremiz/beremiz/targets/toolchain_gcc.py", line 96, in build
Builder_CFLAGS = ' '.join(self.getBuilderCFLAGS())
TypeError: sequence item 0: expected string, NoneType found

Mon, 18 Apr 2016 18:51:59 +0300fix issue, when structure data type with array field is created
Andrey Skvortsov <andrej.skvortzov@gmail.com> [Mon, 18 Apr 2016 18:51:59 +0300] rev 1477
fix issue, when structure data type with array field is created

Traceback (most recent call last):
File "editors/DataTypeEditor.py", line 669, in ElementArrayTypeFunction
self.RefreshTypeInfos()
File "editors/DataTypeEditor.py", line 761, in RefreshTypeInfos
self.Controler.SetDataTypeInfos(self.TagName, infos)
File "PLCControler.py", line 2075, in SetDataTypeInfos
array.baseType.setcontent(PLCOpenParser.CreateElement(
AttributeError: 'lxml.etree._Element' object has no attribute 'setcontent'

Mon, 18 Apr 2016 18:48:15 +0300fixes sometimes happened error during project compilation
Andrey Skvortsov <andrej.skvortzov@gmail.com [Mon, 18 Apr 2016 18:48:15 +0300] rev 1476
fixes sometimes happened error during project compilation

Traceback (most recent call last):
File "./Beremiz.py", line 1229, in run_with_except_hook
run_old(*args, **kw)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 68, in run
self.endcallback(self.Proc.pid, err)
File
"/home/developer/WorkData/PLC/beremiz/beremiz/util/ProcessLogger.py",
line 169, in finish
if self.timeout: self.timeout.cancel()
AttributeError: ProcessLogger instance has no attribute 'timeout'

Wed, 21 Oct 2015 15:00:32 +0100merge
mjsousa [Wed, 21 Oct 2015 15:00:32 +0100] rev 1475
merge

Sat, 06 Dec 2014 19:31:51 +0000Use '-p' command line option when running matiec (iec2c)
mjsousa [Sat, 06 Dec 2014 19:31:51 +0000] rev 1474
Use '-p' command line option when running matiec (iec2c)

Wed, 26 Nov 2014 16:05:14 +0000Add command line option '-l' when calling matiec
mjsousa [Wed, 26 Nov 2014 16:05:14 +0000] rev 1473
Add command line option '-l' when calling matiec

Wed, 12 Nov 2014 17:36:27 +0000merge
mjsousa [Wed, 12 Nov 2014 17:36:27 +0000] rev 1472
merge

Tue, 08 Jul 2014 18:01:33 +0100merge
mjsousa [Tue, 08 Jul 2014 18:01:33 +0100] rev 1471
merge

Fri, 06 Jun 2014 18:30:49 +0100merge
mjsousa [Fri, 06 Jun 2014 18:30:49 +0100] rev 1470
merge