github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
View file

@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using System.Windows;
namespace GreenshotConfluencePlugin {
@ -26,7 +26,7 @@ namespace GreenshotConfluencePlugin {
/// Interaction logic for ConfluenceConfigurationForm.xaml
/// </summary>
public partial class ConfluenceConfigurationForm : Window {
private ConfluenceConfiguration config;
private readonly ConfluenceConfiguration config;
public ConfluenceConfiguration Config {
get {
return config;
@ -34,7 +34,7 @@ namespace GreenshotConfluencePlugin {
}
public ConfluenceConfigurationForm(ConfluenceConfiguration config) {
this.DataContext = config;
DataContext = config;
this.config = config;
InitializeComponent();
}