From ad394ba8ea6bb8ef227400f2ef4988d3dc09ee21 Mon Sep 17 00:00:00 2001
From: HammerGS <drivingguy@hotmail.com>
Date: Sun, 5 Jun 2016 17:36:35 -0600
Subject: [PATCH] ready to develop <0.3.30>

---
 MekHQ/docs/history.txt                     | 4 ++++
 MekHQ/packaging.xml                        | 2 +-
 MekHQ/packaging_local.xml                  | 2 +-
 MekHQ/src/mekhq/resources/MekHQ.properties | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
index a41fab4b0a..a6b410d2c6 100644
--- a/MekHQ/docs/history.txt
+++ b/MekHQ/docs/history.txt
@@ -1,5 +1,7 @@
 VERSION HISTORY
 ----------------------------------
+v0.3.30-git
+
 v0.3.29 (2016-06-05 22:40 UTC)
 + Adding a simple view option to the interstellar map (show/hide "empty" planets)
 + Code cleanup/refactor of the interstellar map panel
@@ -15,6 +17,8 @@ v0.3.29 (2016-06-05 22:40 UTC)
 + Issue #89: AtB - NPE Setting Planetary Conditions
 + Interstellar map panel QoL improvements: Zooming at the middle of the screen
 + PR #95 - AtB Uses Int Ops Reputation Factor when IO rating is used
++ Updated MegaMek.jar to 0.41.19
++ Updated MegaMekLab.jar to 0.1.55
 
 v0.3.28 (2016-04-16 19:30 UTC)
 + Bug #43 / PR #62: Making admins gain their XP less often than once per week if requested,
diff --git a/MekHQ/packaging.xml b/MekHQ/packaging.xml
index f907a09caf..31091217c4 100644
--- a/MekHQ/packaging.xml
+++ b/MekHQ/packaging.xml
@@ -20,7 +20,7 @@
     <!-- Global properties for this build -->
     <!-- Version and packaging properties -->
     <property name="project.name" value="mekhq" />
-    <property name="version" value="0.3.29"/>
+    <property name="version" value="0.3.30-git"/>
     <property name="osxdist" value="${project.name}-${version}-mac" />
     <property name="windist" value="${project.name}-${version}-windows" />
     <property name="nixdist" value="${project.name}-${version}" />
diff --git a/MekHQ/packaging_local.xml b/MekHQ/packaging_local.xml
index 8c18a105d4..3d0e540e22 100644
--- a/MekHQ/packaging_local.xml
+++ b/MekHQ/packaging_local.xml
@@ -20,7 +20,7 @@
 	<!-- Global properties for this build -->
 	<!-- Version and packaging properties -->
 	<property name="project.name" value="mekhq" />
-	<property name="version" value="0.3.29"/>
+	<property name="version" value="0.3.30-git"/>
 	<property name="osxdist" value="${project.name}-${version}-mac" />
 	<property name="windist" value="${project.name}-${version}-windows" />
 	<property name="nixdist" value="${project.name}-${version}" />
diff --git a/MekHQ/src/mekhq/resources/MekHQ.properties b/MekHQ/src/mekhq/resources/MekHQ.properties
index 1592694711..4f8f465560 100644
--- a/MekHQ/src/mekhq/resources/MekHQ.properties
+++ b/MekHQ/src/mekhq/resources/MekHQ.properties
@@ -2,7 +2,7 @@
 
 Application.name = MekHQ
 Application.title = MekHQ
-Application.version = 0.3.29
+Application.version = 0.3.30-git
 Application.vendor= MekHQ Project
 Application.homepage=https://github.com/MegaMek
 Application.description = A program for managing BattleTech campaigns played via MegaMek or tabletop