Show
Ignore:
Timestamp:
12/25/08 22:28:50 (4 years ago)
Author:
gpolo
Message:

Merged revisions 3858,3876-3877 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r3858 | nopper | 2008-12-21 10:52:40 -0200 (Sun, 21 Dec 2008) | 1 line


Fixing horror

........

r3876 | getxsick | 2008-12-25 19:31:37 -0200 (Thu, 25 Dec 2008) | 1 line


#191: psyco is off if UMIT_DEVELOPMENT was set

........

r3877 | getxsick | 2008-12-25 20:08:50 -0200 (Thu, 25 Dec 2008) | 1 line


Added missing import of I18N

........

Location:
branch/NetworkInventory
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branch/NetworkInventory

    • Property svnmerge-integrated changed from /trunk:1-560,1370-1397,1399-1418,1420-1464,1471-2012,2560-2571,2617-2796,2805-2998,3010-3285,3307-3679,3705-3789,3792-3804 to /trunk:1-560,563-566,574,577-597,599-615,617-618,620-635,641-648,651,653-662,666-667,669-764,766-845,848-964,966-1038,1041,1047-1059,1070-1103,1113-1119,1139,1156-1187,1189,1196-1202,1206-1223,1225-1241,1244-1248,1251-1258,1260-1274,1276-1279,1281,1283-1284,1290-1295,1297-1305,1307-1308,1310-1311,1313-1322,1326,1328-1333,1335,1337-1397,1399-1418,1420-3877

  • branch/NetworkInventory/umitCore/UmitDB.py

    r3827 r3878  
    2222 
    2323import md5 
     24 
     25from umitCore.I18N import _ 
    2426 
    2527sqlite = None