Changeset 942 for branches/features/purchaseOrders/web-app/images

Timestamp:

May 22, 2011, 12:29:29 AM (14 years ago)

Author:

gav

Message:

Svn merge -r920:r941 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (2 props)
• web-app/images/background_fog.jpg (deleted)
• web-app/images/favicon.ico (deleted)
• web-app/images/gnuMimsIcon.ico (deleted)
• web-app/images/gnuMimsLogo.png (deleted)
• web-app/images/grails_logo.jpg (deleted)
• web-app/images/logoOnlineDemo.png (copied) (copied from trunk/web-app/images/logoOnlineDemo.png)
• web-app/images/skin/closed.png (copied) (copied from trunk/web-app/images/skin/closed.png)

branches/features/purchaseOrders

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml