IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/Constants.java
	src/main/resources/ValidationMessages.properties
	src/main/resources/hibernate.cfg.xml
This commit is contained in:
Josef Rokos
2014-06-07 22:02:25 +02:00
parent 8db25ecdda 4451850603
commit 607139d790
22 changed files with 337 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/ValidationMessages.properties
+1 -2
View File
@@ -1,4 +1,3 @@
#Generated by Eclipse Messages Editor (Eclipse Babel)
BuildingsFormCodeConstr = Zadejte k\u00F3d budovy...
MaterialFormCodeConstr = Zadejte k\u00F3d materi\u00E1lu...
MUnitsFormCodeConstr=Zadejte k\u00f3d m\u011brn\u00e9 jednotky...
src/main/resources/hibernate.cfg.xml
+1
View File
@@ -11,6 +11,7 @@
<mapping class="info.bukova.isspst.data.BaseData"></mapping>
<mapping class="info.bukova.isspst.data.Address"></mapping>
<mapping class="info.bukova.isspst.data.Building"></mapping>
<mapping class="info.bukova.isspst.data.MUnit"></mapping>
<mapping class="info.bukova.isspst.data.Material"></mapping>
</session-factory>