labofsahil/github-event-dataset-2012 huggingface dataset:
Manual Merge of:

Ports from wings1:
- Fix handling of character encoding properly, so that it works
on Tomcat 6.x+ and can handle Umlaute in <html>formatted labels
as well as chinese characters (see wingset demo)
- Introduce JDK 1.6-like clearSelection()
- Bugfix in SDialog.hide()

http://j-wings.svn.sourceforge.net/viewvc/j-wings?view=revision&revision=4402
Router: don't foreach on non arrays.
Datamodel: wraps data items for permissions, pre/post hooks.
Added a smiple 'getUser' method to the request.
Slow Query Script
added ibs as a root pom project
added ibs-core module
added ibs-api module
added ibs-webui module
checkpoint, working on modifications still, starting to change internals as needed to make it work
Lade till kommentar (ja, jag skulle bara testa om git fungerade :-D )
scratchpads! <3 cwills
Added a basic testing def to language. Also corrected bug where negative
decimals couldnt be read.
Added testing from script - covers simple inline data.
fixed bug where epochs/restart might be zero.
moved defaults in TrainingDef
Show warning about java version when java 1.6 or lower is installed.
Show welcome dialog in the first 10 startups.

Welcome dialog shows information about how to report bugs in vhdllab.
Testing with different versions of django
Pointer to RTFD documentation added to readme
Merge pull request #36 from evildmp/patch-1

Pointer to RTFD documentation added to readme
Added Daniele to AUTHORS
correct IRC channel advertised
Merge pull request #37 from evildmp/master

What good is it sending potential users to a channel with only a bot to talk to?
Fix annoying little grammar typo in the "derives from django-nani" note.
Merge pull request #40 from akx/patch-1

Fix "closely related" in the docs
the GUI stuff
Fixed bug that caused NPE when trying to compare null parties
subtlety is, you know, nice and shit.
robots.txt added for great compatibility
moved to minified script js
client connections now tracked!
security backup
done
omg
Ignore unexpected removeHandler calls.

I'm not sure that this is the right thing to do long term, but it will
improve the experience of our current users.

See https://github.com/josephg/ShareJS/issues/117
Primeras propuestas de wireframes
Add syntax hilight for thor files
Fix cache clear in regular mode

Overlooked (serious) bug introduced after switching to id matching algorithm.
Improved tests
url-select: support namespaced configurations
Merge branch 'namespaced-options'

Conflicts:
	url-select
Merge remote-tracking branch 'upstream/master'
updated README.md
Merge remote-tracking branch 'vifon/master'

Conflicts:
	url-select
Last touches to merging auto-copy
Removed two unnecessary ignores of Command-T files. Ignored vim directory
history.
Added initial .ghci
Added missing terminal vim symlink.
Changed .vimrc to use pathogen for plugins. This allows updating by simply
pulling the latest version from github.
Fix bug causing group hooks to apply to routes defined after and outside of the group.
added ocs
revision of the first persuasive speech
Implement the Webcomic Upgrade tool.

Final major update before an official release.
added tty.local symlink for the local radio to make it easy to find
Changelog update
Argsort/rank do not propate has_missing. Tutorial update
uncommented sqlite gem
Treebase-record successfully transformed by miapatest.xsl

found the problem right after last commit.  treebase-record.xml had an
unnamed xmlns attribute in the nex:nexml root element.
Adding a second mode of operation there the source and destination URIs are explicitly specified.
Fixing sponsor images, updating details.
Fixing some errors.
Added super initial build scripts.
Fixes
Latest changes
doc: IntSequence
doc: ASMI reader
loading from static files
Merge branch 'master' into registration
Merge branch 'master' into reports
Merge branch 'master' into admission
Merge branch 'master' into ppr
Merge branch 'master' into services
Merge branch 'ppr'
Merge branch 'registration'
Merge branch 'reports'
Merge branch 'admission'
trying to fix list spacing
remove the strtolowers as they break PSR-0 and ucfirst as a saftey
Add base54 digits override for unit tests.

Prevents unit tests from depending on how mangled variable name
generation is optimized for gzip compression.
Merge pull request #400 from proxv/override-digits-in-tests

Add base54 digits override for unit tests.
basset: tmp
basset: "collie node list" works

slack!
added noaa condition notes
hinterp_example

Signed-off-by: Matthew Harrison <Matthew.Harrison@noaa.gov>
Some more docs, some more tests
convert masp to use uniform datatype and lists
Fixed csproj which didn't save
Make it compile
Exercises for 5.6
Fix syntax error in static pages test
Removed some warnings from files
sorted franvaro
sorted year lists
Merge branch 'master' into development
New documentation in place for review.
Docs Markdown spacing fixes
Adding new getting-started guide
Fix an issue where if no selections were made in the konf logging would blow things up.

- Also correctly format `data2.js`!
Update docs
Update docs
Update docs
Update docs
Merge pull request #22 from mobify/fix-no-selectors

Fix an issue where if no selections were made in the konf logging would ...
Update master
New documentation in place for review.
Docs Markdown spacing fixes
Adding new getting-started guide
Update docs
Update docs
Updates for presentation in to HTML
Lots of changes

• Make all terms singular
• Always use commas to separate definition bits, no full sentences here, all passive voice
Ready for CI integration!

- Move QUnit tests into one file.
- Add back `junit.js` to serialize results to XML for Jenkins
- Fix a bug in isStale on bjorked cached resources.
add a paragraph break, a missing "the" and make talk about selections consistent with query docs "a set of elements"
rejigger language to be more consistent, use underscores around path/filenames and adjust style of code examples slightly
Adjusting HUD arrows
Splitting out carousel control styling into its own CSS file, adding examples of bulleted and paginated controls.
Work to date commit before refreshing the live site.
Merge branch 'open-source-site' of https://github.com/mobify/mobifyjs into open-source-site
Modified and renamed LICENSE file.
My First implementation of Sieve of Eratosthenes
String compare aliases.
euc-jpファイルが読めるように修正
remove obsolete comment
code cleanup
Sri, BalajiN | #1285 | Fixing failing tests
Perswin project
experiment with breaking out javascript into separate files.  does this better isolate the authentication code and make things easier to navigate?
add a spinner while waiting to detect login state or verify assertions
point to browserid staging servers.  closes #7
Improve a11y: empty alt-attribute

Instead of hearing "firefox Need help with firefox?" you now hear "Need
help with firefox?
Remove license block section of coding standards; we're not using per-file license blocks anymore.
Merge branch '1.0.X'
dummy commit to kick off documentation build
Avoid cryptic abbreviations in function names.
verifier: Fixed runtime multi names and vector related issues.
Fixes bug 778706 - Removed useless SQL utils functions.
Merge pull request #758 from AdrianGaudebert/778706-clean-up-sql-utils

Fixes bug 778706 - Removed useless SQL utils functions.
bug 751298 - run for yesterday not today
Merge pull request #596 from rhelmer/bug751298-nightly_builds

bug 751298 - run for yesterday not today
Made HTTP exceptions more generic (bug 797094)
instant refund support for solitude (bug 771225)
add some more octocats
Fix retry default
Merge pull request #402 from titanous/fix-retry

Fix retry default
Update html/with.sublime-snippet
updated users toolbar
removed UserSchema.pre update
VTKLoader using EventTarget.
JSONLoader next...
Refactored Blender animation export to work also when there are no action groups.
Added fix for troubles with setting anisotropy for float textures on Linux.

Phew! Thanks @mrdoob for valiant testing.
Merge remote-tracking branch 'remotes/mrdoob/dev' into unflip
Instagram import works
add methods
add instagrams to views
view twaeks
add docstring for depends
small fix
Merge pull request #1 from nouiz/gpu-send-wait

small fix
deb rpm: add 2.09 entry
doc en: update the description about argument of mroonga_snippet
Adding cassandra error logging
[lint] Remove empty and obsolete files that confuse the linter.
[lint] Massive slew of linter warnings fixed.
Make sure that shipment for resumed order can be set to ready
move dunstwrap to xinitrc
Bulk request
Forgot to 'to_s' the resulting query_terms. Even though it worked with the the array.
Wanted join, not to_s, but worked (as the other two) anyway.
Merge pull request #1 from msievers/bulk-search-request

Bulk search request
Fixed possible null pointer.
Ignore .DS_Store files.
Remove debug output.
MDL-26099 validate the phases open dates and deadlines
MDL-26099 new workshop DB field phaseswitchassessment

Note that most line changes in the patch are caused by the recent
changes in the XMLDB TEXT fields handling (no size specified now) and by
the change in the indentation.
updates:
- ignore list build 2
updates:
- ignore list build 2
updates:
- ignore list build 2
Merge branch 'master' of github.com:mudrweb/mudrweb
updates:
- debugMode on production server set to off
handle null last sync date
tack Linux
added alias for zgrep and changed alias for grep
Add real comment to example
fixed Matrix.addLine
Merge pull request #4 from kanemura1206/master

Fixed Matrix.addLine
made forUpdate() available for all SQL queries
#313 added in method to PrimaryKey and ForeignKey
#304 updated performance test
Add missing '/' to Delete API route
Hawt new 404 page design
[fix #31] Don't show project if it has no statuses
Use hashlib instead of deprecated md5
Merge branch 'use-hashlib'
Make time on status updates more inconspicuous.
2012-11-11-22.39.46: src/lib/std/src/hostthread/io-wait-hostthread.pkg: Mutex-related tweaks, many taking advantage of new hostthread.pkg increment_microthread_switch_lock() / decrement_microthread_switch_lock()
2012-03-24-21.20.36: src/lib/core/internal/mythryl-compiler-version.pkg: Updated version to 6.2.0
import local variable "window" to mcore.js
BZ 858997 - Wraps login page JS with document.ready

The code to handle 401s on the login page should only be called
when the document is ready.
Sleep between document adding
add django support
add postgresql service
add auth
Style sidebar profile and compare
renamed project from rest.go to rest so that go get works properly
Updated DelimitedFile README example.
BF: adjusted to support nosetests
Merge branch 'master' of github.com:nchiapol/pelita
Correctly clone FuncTypes, fixes lotsa problems with specialization :)
Fixed a sneaky bug where some functions would appear twice
^ Getting efforts to be able to be edited as a duration record
! Case issues
! Case issues
^ Speed optimisations and general improvements
^ Sorting out the issues with generating a divKey with a rand() function
^ Making Has*Many grids load when clicked, not immediately
Merge remote branch 'origin/home'
Add Login basic UI and changes to library reference inside the project
rearranging some code and fixing some python code that somehow got into my javascript
Better error messages from CREATE UNIQUE problems
Fixes #797: CREATE UNIQUE now makes sure used identifiers have the same properties even if they are re-used without the properties
The tests do not pass. Will work on this and re-PR.

Revert "Fixed problems with expressions that work on collections"

This reverts commit 49e7e44c494846e73129f032214fbc4af08fae08.
Identify more physics shape data. Convert likely looking floats.
acceptance stuff
NO_STAGEBG config trigger
improved the no-stage-bg feature, and extended the options menu functionality while I was at it
Added a log message for the automatic switch off.

changed the if in stage.c because it did wrong things.
moved calc_fps to stage_loop - fixes a NO_STAGEBG=2 bug
fixed "jumping" stage background after leaving the menu
Merge pull request #6 from nexAkari/stagebg-options

FPS and bg fixes
Added skeleton for stages 3 and 4
Stages are registered in a global array
Merge branch 'master' of github.com:laochailan/taisei
Fixed lasers
Added stageselect menu for the debug mode
Merge remote-tracking branch 'upstream/master' into stageselect

Conflicts:
	src/main.c
	src/menu/mainmenu.c
made use of the hidden flag
fixed case
Merge pull request #7 from nexAkari/stageselect

Stage selection menu and cleaner registration of stages
Use RequireJs in examples.
Add new version of RequireJs.
Refactor RenderJs init part.
adding mostrc and aliases
mail: Improve Mail class
Update downloads/newest.txt

1.0.14
Converted nwnx_haks to core2.8.  Modified some headers in include/structs/ namely CNWSArea.h, CNWSModule.h.  Added CServerInfo.h which contains server settings.  One small compibility patch with nwnx_extend which used a hardcoded offset to the CServerInfo struct
CServerInfo.h: field_114 should be uint8_t
Fixed missing function addresss
Updated README.md

We're now using the MEPL for licensing! Party on, dudes!
Desde sublime
Aca va la cosa.........
Private class date() extracted from getView().
RES -> resume for clarity
lots of motion to make locations transparent to breadcrumber
executive offices need an index too
last index for bylaws
[doc] add setdrones to `jitsu help apps`
Add assertions for s, c and e options
added support for getting data registers outside of dcpu file
Fixed unit fades
removed unused old files
cleanup to latest version with licenses
moving carousel to tests - sorry dan
完成Drag&Drop以及点击文件上传
Added some synchronous logic to deploy workflow.
Update notes for submitted changes

* cfi: fix type-punning warnings in cfi_spansion_write_block
Update notes for submitted changes

* stlink: check read_reg result
tools/initial.sh

Small script to setup Gerrit with the local repository

Usage: tools/initial.sh <username>

Change-Id: I26527c35cfe040c7752efec06064d5dc9e3ec6a2
Signed-off-by: Ulf Samuelsson <ulf@emagii.com>
Signed-off-by: Attila Kinali <attila@kinali.ch>
Reviewed-on: http://openocd.zylin.com/290
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Standard Gateway
Initiated API Modules
Fixed bug in ldap service
Composition updates
my
SB.js added
Upload the module (thanks Luis Santos)
Cleaned up template and added logo
Merge pull request #1 from ninjapanzer/master

Theme update
Clear up partials
Add unit `%group`
Clear up variables
Version 2.3.11
Leo found the issue: integer is returned, so use different range.
Use common street abbreviations when normalizing addresses.
Improve apartment recognition during address parsing.
Slightly simplify the example on the front page.

The purpose is that the example is simple enough to grasp by somebody
not knowing OCaml while still showing OCaml strengths.
slightly changed description of membership duration
Deactivate database intensive operation in template
fix config type bug
add 500 and mv css out
Merge branch 'master' of github.com:offerduoduo/odd
change cur dir
solve unknown city contact display bug
added OcaIDE (eclipse plugin) project nature to Ocaml llvm project
adding a view for when there are no meetings
exiting the process...
Fixed small typo s/Subscriptons/Subscriptions.
Upgraded code to support polymorphic binding, and a minor bug fix that was hindering proper mtpl definiton for this.
Set executable permissions.
Merge pull request #2 from mranney/master

set permissions
Why was there a funky character here?
Deleted a spare file and repaired logic views in admin namespace.
[OpenAAF-Panel] add UP80 keymap (no radio/media button) + some setup screen fixes for VFD
[translations]update po.de
Windows: cm_ExpandSysName for 64-bit processes

on 64-bit Windows, only 32-bit processes have the WOW64 request
type flag set.   Reverse the conditional to permit proper evaluation
of the 64-bit sysname list.

Reviewed-on: http://gerrit.openafs.org/8147
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit c2e4112ffe44bc5c638a79f88eab0377ec992784)

Change-Id: I0017785bb792f6ee3aaa169e75e04a27ff0cacc2
Reviewed-on: http://gerrit.openafs.org/8184
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: Add bWow64 param to RDR_InitReq

Instead of using the pattern

  RDR_InitReq(&req);
  if (bWow64)
     req.flags |= CM_REQ_WOW64;

add bWow64 as a parameter to RDR_InitReq().

Reviewed-on: http://gerrit.openafs.org/8157
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit ac97f8f5a6937398db7d1902ff6bab7adbc24f4a)

Change-Id: Ibde72ff4ad8cbca3e6f44d51f72458cb820d6976
Reviewed-on: http://gerrit.openafs.org/8185
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
butc: don't pass NULL to strcpy in RcreateDump

volumesetNamePtr can return a null pointer in certain error
conditions.  Check for this and return BUDB_BADARGUMENT rather
than dumping core.

Change-Id: If0ce509c964211ffa591d8e095b7c32c51ae7bc3
Reviewed-on: http://gerrit.openafs.org/7890
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Windows: AFSRedir code cleanup

Remove unnecessary intermediate variables.

Do not drop lock only to reacquire.

Formatting.

Reviewed-on: http://gerrit.openafs.org/7519
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit 5335f77bd56b7a94fd0225477fe7b7a707df86b7)

Change-Id: Ib0330bbf0331f669460969ea8b4a9c9f82e448df
Reviewed-on: http://gerrit.openafs.org/7528
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Windows: Redesign of server preferences

Server rankings should be composed from three values:

 1. administrative preferences

 2. network address locality

 3. peer performance (rtt and congestion window)

This ensures that local subnet servers are always
preferred.

Add a new rank for down servers so they are always
sorted las in cm_serverRef lists.

Reviewed-on: http://gerrit.openafs.org/7757
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit a9be0735b5e23adefc5fd57083ca206e61820bab)

Change-Id: I6954a851115ba4b5bb3987ed46afd487156b03a7
Reviewed-on: http://gerrit.openafs.org/7760
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
macos: next version support

support things beyond 10.7

Change-Id: I7a50f569fd43e0e1ed3c74f0480a8e2521df1bc5
Reviewed-on: http://gerrit.openafs.org/7763
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Started work on our solvers widget (#112).
Some work on our solvers widget and our new parameters widget (#112).
Minor general GUI update.
latest version of OL
Remove old TimeManager refs from js build file
Updated dimNG versions of submodules
Moved discovery code into separate repo.
Update notes for submitted changes

* Only set TCP_KEEPIDLE where supported
Do not bind patch version of stylus&nib
Translate shutdown msg to finnish
Remove useless workaround
minor fixes
added comments stats (theme oc-admin)
Merge branch 'issue-newManageItems' of github.com:osclass/OSClass into issue-newManageItems
added reports stats (theme)
improved myreporter
Removed Fluent NHibernate dependency since it does not work under mono
algo…
Open source for Enterprise
and pad software preparing
Global Objects 번역
console 변경사항 적용
Modules 변경사항 적용
Addons 변경사항 적용
process 변경사항 적용
util 변경사항 적용
Events 변경사항 적용
Buffer 변경사항 적용
Stream 변경사항 적용
WL-2495 Improve position of two new options
Ingreso de fecha OK en create y update.
New Menu Form valida si existen o no locales asociados
Merge branch 'master' of github.com:oxfist/menusach
Merged
menu_links is now a class

This should make it almost HTML valid
Correctly handle assert_cookie(name, message) situation
Show user-supplied message when failing
jon.png doesn't exist, but jon.jpg does!
Change inner representations of VertexData from List to Array types.
Add cosmetic changes to InputManager.
Add wiresphere rendering capability to DebugRenderer.
Add keywords to setup
Z. 2: Anpassung an BL IX 211
Z. 3: Δωσατεφάνου → Δωσᾶ Σ̣τ̣εφάνου (kontrolliert an Abb. im Internet; Δωρᾶ [Σ]τεφάνου BL IV 69)
Z. 13 Spatium zwischen ε[ἰ]ς und λι
Z. 43-44: Anpassung an BL IX 211
Z. 44: Anpassung an BL VI 117 und [σ]τραγηγῶν → [σ]τρατηγῶν (Eingabefehler)

 - Z. 2: Anpassung an BL IX 211
Z. 3: Δωσατεφάνου → Δωσᾶ Σ̣τ̣εφάνου (kontrolliert an Abb. im Internet; Δωρᾶ [Σ]τεφάνου BL IV 69)
Z. 13 Spatium zwischen ε[ἰ]ς und λι
Z. 43-44: Anpassung an BL IX 211
Z. 44: Anpassung an BL VI 117 und [σ]τραγηγῶν → [σ]τρατηγῶν (Eingabefehler)

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Update revisionDesc

 - Vote - Accept-Straight-to-Finalization - Fine. (James Cowey)
 - Finalized - Ready. (James Cowey)
Fragmentos "realtime": siempre són invalidos

Eso implica que se recalculan siempre. Ejemplo: fragmento "ago",
donde sale una frase tipo "hace 45 segundos". La diferencia de tiempo
hay que recalcularla cada vez, porque el tiempo va pasando...
Added color interpolation, too.
Added a function to resume the Timer.
Copy new renamed twrp grouper kernel build script instead of the old one
Moved to d20ogl

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18805 ef53c05b-3124-4d59-ae7d-fe3273f42be7
[Paizo] Player Companion: Orcs of Golarion

prep for Alpha move
Issue#: NEWSOURCE-145


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17177 b6a209e6-650d-0410-972b-dadffa731f64
Allow PREMULT in DOMAIN tag for a class. 

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17282 b6a209e6-650d-0410-972b-dadffa731f64
added dataunit of the new EIDs to hexalog
added http error if the state machine tables are too large
Merge branch 'development' into pcopfer_ruby_obj
Backtry bug fixes. Issue #30
Issue #26
More test cases
Disable rbenv
Merge work machine with upstream.
Bits and Pieces
fixed #27, operator overloading +=
im interpreter
Merge branch 'master' of https://github.com/peq/WurstScript
use space to page up and down
new client and remove some resource
Started working on new collection navigation model
First working implementation of alternative collections navigator
Merged from master
bug fixes
New collections logic, tag selector (without tag loading)
Merge branch 'collection_navigation_proto'
Initial tag controller implemented with uilabels
Pulled all submodules and added CSLProcessor as dependency
Removed modified uservoice and pulled all dependencies
Updated to settings for beter iOS 6 compatibility
Reworked the support features to use UserVoice
first working tag implementation
Bug fixes
Relese notes for the lates beta build
version 1.2 start images
New app icons
New app icons for aplha
Configured the iAnnotate build
Added the iAnnotate libraries as dependency (the libraries themselves are not included in git)
Force layered navigation on iPad version as well
minor tweak on date_hired type
init
Merge branch 'master' of http://github.com/phiree/namename
Merge branch 'master' of http://github.com/phiree/namename
QUery on SHopStore
save and close buttons hooked up properly. save plus close button added, two in one ftw. bump.
implemented add,update and delete configuration by method
Merge branch 'master' of https://github.com/phresco/commons
server.config file property changes
Merge branch 'master' of https://github.com/phresco/phresco
[artf566734] Checking password parameter for device and simulator
Bug Fixed Functional tests execution failed for Iphone hybrid application expecting POM files
artf463543 - In the configuration Tab
artf469582 - Execute Sql is not hidden in deploy popup for widget projects when any updation made in appinfo page.
Merge branch 'boston' of https://github.com/phresco/phresco into boston
Limpieza de ficheros temporales.
ajout package algoChangementMin
Added "Powered by Foursquare" image to detailed restaurant page
Configurações do warble para ruby 1.9
zend framework update conflicts

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1654 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
bumped to dev19 for next release
SignalingManager is able to select between several signaling channels
Change Podio class to use static methods instead of a singleton, better way to do json_decode
Switch away from namespaces, finish implementation of PodioHook
as_json that works, handle relationships properly when writing to son, first instance method for saving tasks
Fixing win32 build.
Merge branch 'master' of github.com:/pokerth/pokerth
Fix ptarray_area_sphere signature (#2040)

Since I was a it I also removed a "set but not used" warning.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10413 b70326c6-7e19-0410-871a-916f4a2858ee
Fix a "set but not used" warning.

This was about the return from getPoint2d_p, but it really only
returns zero on error and after lwerror was called, and only if
a PARANOIA compile time macro is set...

git-svn-id: http://svn.osgeo.org/postgis/trunk@10414 b70326c6-7e19-0410-871a-916f4a2858ee
Fix compiler warnings in lwgeom_geos.c

git-svn-id: http://svn.osgeo.org/postgis/trunk@10415 b70326c6-7e19-0410-871a-916f4a2858ee
Rate more people page
some of these predicates needed better names. now the names focus more on what these are *modeling*, rather than details of their actual prolog implementation
tiny bit more comments and odds-n-ends
getting some meaningful layers in my 'architecture' so far, so i can better assess what the achievements and objectives are on a layer-by-layer basis
essentially taking my commit note from commit 11247393e and putting the text into a code comment where i will see it on a more frequent basis
more files to keep for reference. doing a 'visual diff' on these illuminates the similarities and differences between aggregate functions without group by and those *with* group by
folder organization to match the same principles of 'layering' that i mentioned in commit 6fc74ebf8
hallelujah! user:prolog_file_type lets me tell swipl to recognize files with a '.pro' extension. no more symlinking to '.pl' -- phew
OpenSRFSession -> osrfSession
adding attachements for item type transmit and proposals
Merge branch 'master' of github.com:prasofty/ezfeed
added done flag on tasks
Latest version of YoutubeListener and PacketData
yes, i don't know why i called it 'doc' either
reorganization of build system to dmake
Added phpdocs to the AdminBundle files
Merge branch 'master' of https://github.com/protalk/protalk into phpdoc
Merge branch 'master' of https://github.com/protalk/protalk into phpdoc
Added phpdoc to load() function
Modified DocBlocks
Modified DocBlocks
Merge with master
Merge branch 'master' of https://github.com/protalk/protalk into phpdoc
Merge pull request #75 from artur-gajewski/phpdoc

Added phpdocs to the AdminBundle files
classifier interface refactoring.. + added singlefocusfeature parameter
include redis gem
Merge remote-tracking branch 'upstream/master'
Make query more broad
Добавил в About упоминание о DotNetZip Library
added missing requires in .emacs to resolve issues on mac
added linem in elisp
corrected .emacs for emacs24
Update SDK version in Rakefile
Update Growl framework
Setup emails; add application form file
ignore .DS_Store files on OS X
refer to correct fn name
Add live versions of forward and backward kill sexp fns.
Merge branch 'master' of https://github.com/overtone/emacs-live
tog bort kommentarer i forumMenu
Merge branch 'master' of github.com:pum2pum/pum2pum
DOM for speed, fixed animation by reverting to gif
Fix some issues for easy manual edition
Don't try to validate a contact form just because the page is post.
By checking for the specific contact form button name it can only run if THAT form was submitted.
Only link to users profile in comments if enable_profies is enabled.
When inserting images don't try and thumb if they select full size.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
add back notifications for all
claim compatibility with Python 3.2
claim str return type (there's no unicode in Py3k)
replace invalid unicode type with aliased basestring
which also fixes all the deadlocks in TestClientTransactions
Updated model,
Correct database initialization/seeding added,
New folders/Name spaces added.
Updated model, Correct database initialization/seeding added, New folders/Name spaces added.
Model updated, search corrected, data intialization updated.
fixed double button bug
Merge branch 'master' of https://github.com/qballer/yael.js
fixed doneCB bug
useless comments added :)
Fixed classname for new test class.
[BUG #5740] Renamed MEvents to MEvent.
Pattern-matched let
important bugfix for log_entry_dependency
Sync with df-structures changes
Describing fugitive
Documenting fugitive
shared configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
test: add tests for DocumentTask#translate_languages
banging head on level order
Reduce displaying lawless for performance
Cleaning up formatting a bit to my taste.
run more clues by default
Untested code to cache parsed clue structures
bug fix for longer phrases
Fixed bugs in precomputed CFG loading
used cached_cfg clues when possible
Change hello world example to not use espresso\app (because it is slow)
add more log message
Merge pull request #5 from reallongda/longda

add more log message
Report how long DBFlush took.
Workaround for bootstrap collapse bug [story:41099297]
Adds deprecated tasks for plugins migration.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9597 e93f8b46-1217-0410-a6f0-8f06a7374b81
Traditional Chinese translation updated by ChunChang Lo (#12176)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10696 e93f8b46-1217-0410-a6f0-8f06a7374b81
Fixed that project identifier can always be updated (#11028).

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9710 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged rails-3.2 branch.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Custom JQueryUI theme.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10196 e93f8b46-1217-0410-a6f0-8f06a7374b81
was pulling indexFrom  from the wrong  UI element
Finance payable
custom readmoney type
vanilla install
vanilla FOSUserBundle withing with SonataUserBundle and SonataAdminBundle, tag this
EntityAudit and comestic overrides
enable rememberMe for provider
httponly = true for session, always do this.
Prepare to override
remove Acme Demo
Disable registration and password reset, not required by back-office
remove AAcmeDemo related route
SLP namespace and bundles creation
not tracking auto-generated backup files
route for impersonating by superadmin
not auditing user entity, at least not by row, as the change rate is very high, like
audit configs
Add contact entity.
validation
config changes
crmBundle
unify the firewall
activate SLPAdminBundle
Added building and callback params
improved: getting data from zipcode
Messages

Model:
 - Mark as read
 - Mark as Unread
 - Delete Message
 - List Unread (New messages)
 - List All Messages
 - I think that's all :)
Fix the broken Python bindings.
1 -> s.size, so offsets are computed correctly.
Slave code. Just reads and outputs messages sent to it. Uses the topic system so the master can be specific about what machines it is sending out to. Added couple comments for clarification, but really just a copy-paste from the tutorial.
revised logo and layout files.
separate reporting from finding
try to adapt to coding style :)
use diagnostic framework to report explicit casts
Refactored skeleton capturing.

Added SkeletonController.
Added some notes and pseudocode/text for MINIMAX
Merge branch 'master' of https://github.com/rlepigre/tin171
- this may break other things but right now this allows nosetest to 
  execute failed tests correctly by name
support for other clients
Add gitconfig and minor conditional change to zshrc
buttons colored icons
added cloning library dependency
use the Lens getter when testing
pagegraphics
pull commit
[Issue #100]
exception handling for ragefaces
lint
added coruja-confirm for confirmation windows
lint
delete authorization headers when not successful or when logging out
allow curly-brace free blocks in javascript.

I'm probably a bad person.
titre du secteur dans le panneau du rubriquage
HAML template fixed (fixes #14)
libgo: Add no-dist and -Wno-portability to AM_INIT_AUTOMAKE.

R=iant
CC=gofrontend-dev
http://codereview.appspot.com/6545048
compiler: Update for GCC push_cfun changes.

R=iant
CC=gofrontend-dev
http://codereview.appspot.com/6544046
pics compressed
warning for firefox users that syncing back to the main editor window isn't supported in firefox
use system spelling engine on osx
updating benchmark data, doc and cov
Documenting and refactoring the Emailer class, introduction to documentation.
Install ember in vendor
FXML demo broken
(a) file location
(b) containsKey method calls
Merge pull request #6 from shemnon/c45b33b42800fa7b44e6b031313b2d0bd9f89e35

fxml node and demo is broken
Change to use GroovyFX.start, as JavaFX fails with an NPE if the initial stage has not been initiatlized
Add Platform.exit()
Fix binding property of parent node
Fix binding property of parent node
Refactoring
Added helper method to encode a hot spot with no auxiliary variables
Thread: try to fix 7238

git-svn-id: http://svn.boost.org/svn/boost/trunk@80076 b8fc166d-592f-0410-95f2-cb63ce0dd405
Committed 10k 2 client r=0.05 json
committed 10k 2 clients alpha=.1
Added 10k 2 clients a=1
Merge branch 'master' of github.com:ryscheng/WebP2P
document update
recyclebin_list update
Merge branch 'master' of https://github.com/saegeul/saegeul
dashboard 수정
add README
Merge branch 'master' of git://github.com/saegeul/saegeul
Moved manpages
Fixed more unittests
Merge pull request #122 from jaytaph/wip/cleanup

Wip/cleanup
Initial module loading
userland frames
Merge branch 'develop' of github.com:saffire/saffire into wip/modules
Run-context is functional. Also some fixes in the unitest
Merge pull request #110 from jaytaph/wip/modules

Wip/modules
db_flatstore: do not start unless the directory database exists
backport from trunk (rev #8929):
- more fixes on how to properly fake the internally generated replies, in order to allow lump operations on the replies
  Reported by Nick Altmann
  Closes bug #3515834
ログ出力方法変更
タイムアウト時にリトライするよう修正
versionを1.16に
Merge branch 'release/0.0.6' into develop
Fix: preparation function fails
Merge branch 'hotfix/callback-failure'
Merge branch 'hotfix/callback-failure' into develop
Version increment
Merge branch 'release/0.0.7'
Merge branch 'release/0.1.1' into develop
Extended static files hosting
Extended static files hosting
Merge branch 'release/0.1.2'
multimedia/mythtv-core.25:
- New port mythtv-core.25. Closes #34900


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96917 d073be05-634f-4543-b044-5fe20cf6d1d6
libquvi-scripts: update to 0.4.8


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96918 d073be05-634f-4543-b044-5fe20cf6d1d6
swig: version bump to 2.0.8


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96919 d073be05-634f-4543-b044-5fe20cf6d1d6
mpich2-devel: Update to 1.5rc1; remove legacy configure option


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96920 d073be05-634f-4543-b044-5fe20cf6d1d6
ghc-devel: Mark obsolete and replaced_by the newer ghc


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96921 d073be05-634f-4543-b044-5fe20cf6d1d6
npm: update to version 1.1.54


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96922 d073be05-634f-4543-b044-5fe20cf6d1d6
git-extras: updated to 1.7.0


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96923 d073be05-634f-4543-b044-5fe20cf6d1d6
ZendFramework: update to 1.11.13


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96924 d073be05-634f-4543-b044-5fe20cf6d1d6
pficommon: update git.branch to 6ea510b4e1 for jubatus-0.2.3.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94173 d073be05-634f-4543-b044-5fe20cf6d1d6
jubatus: update to 0.2.3.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94174 d073be05-634f-4543-b044-5fe20cf6d1d6
freeglut: don't need to depend on xorg-libXdmcp explicitly; see #33661


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90912 d073be05-634f-4543-b044-5fe20cf6d1d6
ld64: Remove the LD_NO_PIE hunk as it's not needed


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92369 d073be05-634f-4543-b044-5fe20cf6d1d6
databases/mysql55:
- Upgrade version to 5.5.23.
- Fix notes. Closes #33775
- No longer conflicts with mysql5.
- Add macports-default.cnf with skip-networking.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92370 d073be05-634f-4543-b044-5fe20cf6d1d6
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:
  Fix test
  typo in test
  Make css string constant
  Fixed typo
  Improved performance while sending error page
  - BFN
  - BFN
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
  - Fixed expected test result (patch by ab@php.net in #61769)
  - Fix test title
  add pg_escape_identifier/pg_escape_literal
  fix RCs
  Update to 5.4.2-dev
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
Fixed bug #61812 (Uninitialised value used in libmagic)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61812 (Uninitialised value used in libmagic)
Update NEWS
Merge branch 'PHP-5.4'

* PHP-5.4:
  Update NEWS
  Fixed bug #61812 (Uninitialised value used in libmagic)
Fixed warning implicit declaration of function 'file_printedlen'
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed warning implicit declaration of function 'file_printedlen'
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed warning implicit declaration of function 'file_printedlen'
mylyn problem
Changed engine to kramdown
Adding .gemrc
Adding .gitconfig
Show branch with gs
Add Mac framework
build 20121112.2359
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
changes to opencl to make static all cl variables
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
ssha num keys smaller
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Merge branch 'bleeding-jumbo' of github.com:samuripper/samu into bleeding-jumbo
minor changes

Conflicts:
	src/opencl_nsldaps_fmt.c
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Modified Algorithm name and format name to follow jtr specs
first tests to move find_best_kpc to common_opencl.c
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo
Conflicts:
	src/Makefile
Merge branch 'bleeding-jumbo' of git://github.com/magnumripper/magnum-jumbo into bleeding-jumbo

Conflicts:
	src/Makefile
Merge branch 'bleeding-jumbo' of github.com:samuripper/samu into bleeding-jumbo

Conflicts:
	src/opencl_nsldaps_fmt.c
why new?
Merge branch 'bleeding-jumbo' of github.com:samuripper/samu into bleeding-jumbo
reverting changes
reverting patch
Zeroth cut of viz
Also BuildRequire: unzip if the source URL ends with '.zip' in
opensuse.spec template
Set useful default templates (again)
fix a bug by handwriting
repup: add mutex, and yml config file
Configuring maven
Configuring the SCM connection to GitHub
fuse4x-kext: Use explicit path to cp in caveats

Directions for installing the fuse4x kernel extension rely on the `-X` option
which is only available from BSD `cp` and is absent in GNU `cp`.

Fixes #15364.
fuse4x-kext: Update to 0.9.2
fuse4x: Update to 0.9.2

Closes #14956.
fuse4x-kext: Add bottle version
jenkins 1.485
wxwidgets: A more common name for wxmac.

- Change the blacklist to hint that we include wxpython with wxwidgets.

Closes #15407.

Signed-off-by: Max Howell <mxcl@me.com>
slony: Check for postgres instead of pg_config

This is a better check for ensuring that a server is available.

Closes #15403.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
cqmz: Add universal option

so that both 32-bit and 64-bit libraries get installed.

Closes #15366.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
qpdf: Update to 3.0.2

The patches specified in the formula no longer seem necessary, it
compiles fine without them.

Closes #15405.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
chicken 4.8.0

Closes #15391.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
mpich2: Update to 1.5

Closes #15396.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
open-mpi: Update to 1.6.2

Now clang builds successfully but still fails the test. Changed the
comments accordingly.

Closes #15388.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
x264: Clarify caveats

Update documentation with slightly better explanation. Source here:

  http://mailman.videolan.org/pipermail/x264-devel/2012-October/009601.html

Closes #15348.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
fuse4x-kext: Remove bottle version

A version number was added erroneously only to the Lion bottle for some strange
reason.

This reverts commit 6f3d3f448a1954b3c2650668dff9ab475429b78e.
libdap: Update to 3.11.5
gdal: Update to 1.9.2
tomcat 7.0.32

Closes #15416.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into powerpc
GOB: Correct the name of A.J.'s World of Discovery
GOB: Add a proper GameType for AJ's World
GOB: Add a SaveLoad class for AJ's World

Only contains a temp sprite handler ("menu.inf") for now.
This fixes the graphical glitch after clicking on the cloud.
I18N: updated Russian and Ukrainian translations
I18N: Regenerate translations.dat
20120819_3
Fond
Merge branch 'master' of https://github.com/secu2/inf340_dm.git
CSS (c'est beaaaaau)
added !#
修改rangebar核心功能，增加rangebar辅助功能
重命名slideBar为rangeBar
增加常用方法
version 0.2.4

some spacing issues in Dutch translation
dir_colorsを変更した
FIXBUG: put minutes instead of months
delete require_admin from app controller and add a before filter to active admin setup
Fixed 'weakbreak' css on help page.
changed but nt working, #Stable1
Update scripts/twss.coffee
Added profile for player.
added open by macvim command
added GNU cp command alias: [required] brew install coreutils
* remove copyrighted material
* GRR WHITESPACE
* Remove hardcoded DB revision tags - now in new DB table

If an revision tag is removed (for whatever reason) the corresponding entries will not be shown any more
additional styling changes & new log
Merge branch 'master' of github.com:shopfinder/chai into static_pages
 didn't deal with yelp helper
removed unneeded files
Merge pull request #12 from shopfinder/starting_up

Starting up
Merge branch 'master' of github.com:shopfinder/chai into static_pages
 didn't deal with yelp helper
Merge pull request #13 from shopfinder/static_pages

Static pages
removed redundant top border and sign in information from html
moved db location code from controller to model
refactored shops_controller code using the newly created function to find location in the model
moved presentation code from controller to model to view :)
added coffee and user icon for maps added a few tests for shop model
commented the info windows temp
update location text when delete or move file items
reduce NULL char from some keys
correct DBfields to lower calse total_units, total_price
2.14 解釈した
Hack fix detail button on status page
Merge branch 'master' of github.com:silas/ntfserver
add variant<> (unsafe) in ruin/variant/*.hpp
Added on commit target
Snow mechanic now freezes underlying water to not make floating snow
piles.
All Sensors back on
Fixed weather IC causing listics errors on 1.4.5r0.2 -.
Set Emacs as my external editor in Pentadactyl.
Remove unneeded opening colons from .pentadactylrc.
Add a battery-check alias (bat).
Add a couple gpg.conf options.
Pentadactyl tweaks.
browser-vacuum: add spinner
Add test for adding event to empty data file.
Refactor data file tests.
show CN for SSL Certs
var-tmp
remove unused actions, enable poker_session saving, update specs
Fixed url -> uri references for clarity
Removed extraneous files that DrDr was running
Add more items to the frameless help menu

closes PR 13262
remove the mode where reader errors discovered via online check syntax
are shown in the corner of the window

This was an attempt to avoid opening up a whole status line in the
bottom of the window much of the time. But it doesn't really work
since as soon as you have a syntax error (which are relatively common)
you get that whole line opened up. That it, this attempted GUI interaction
depended on the bogus premise that read errors are somehow happening
in a transient way between error-free states.

closes PR 13267
linked to serialization docs
add ssl hostname verification support
do security-guard check in ssl-load...
added ssl-set-verify-hostname!
add some basic notes on using ssl securely
fix for ssl-set-verify-hostname!
made the 'one-line-summary' of the drracket languages be in tooltips,
instead of in a message% object near the bottom of the dialog
removed the deinprogramm one-line-summary's because they are
just the same as the language names, and so look a bit silly
in tooltips now
add recent changes to HISTORY
fix bug in recent tooltip-related commit
Added bindings to number theoretic functions
Headline in docs
More documentation on number theoretic functions
Documentation on polygonal numbers
Documentation on mediant
Documentation of tangent-number, quadratic-solutions, quadratic-residue and quadratic-character
Documentation for order, orders, primitive-root, exists-primitive-root?, primitive-roots
Merge branch 'tp4_durand' into tp4-cyril

Conflicts:
	lua/forth
Merge branch 'tp4-cyril' of github.com:sogiuser2/Forth into tp4-cyril

Conflicts:
	lua/forth
UTF-8 ogr2ogr bugfix
Update boiler plate to include envp
Login works but isn't very pretty
added contact name in mailto: link
fdsada
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-api/src/main/webapp/.#webclasspath
	hermes/hermes-web/src/main/java/com/source3g/hermes/admin/controller/MerchantController.java
fdddfsd
fix init title

コンソールのタイトルと ckw のタイトルの二箇所で似たような処理を行っていたので一箇所にまとめた.
もともとタイトルを保持する gTitle という変数があったので, それを利用して初期化するようにした.
reordering of ifdef in __hide_alloc_console
Merge pull request #9 from southly/ifdef-reordering

ifdef の整理
Merge pull request #8 from southly/fix-init-title

fix init title
TempFiles should not raise errors
rspec focus