labofsahil/github-event-dataset-2012 huggingface dataset:
Change generated filenames.  Put the phrases "expected" and "failed-diff" toward the end of the filename so files are more appropriately grouped when viewed in file managers and thumbnail tools (eg. gthumb)
Use bincount rather than histogram for comparing images on Numpy >= 1.6.  Continue to use histogram for earlier Numpy versions.
Cache results of previous {PDF|SVG} -> PNG conversions.  We can only cache the baseline images, since the test results are never the same twice given different dictionary orderings in the file.
Use python-ghostscript to convert PDF and EPS to PNG (if available).
Use the same gs process to convert all of the images from PDF to PS
Add a new kwarg to the image_comparison decorator, remove_text, which removes titles and ticks from a figure before comparison.  Use this throughout to make more of the tests less dependent on text differences.
Remove obsolete docs about using ghostscript library since using it doesn't seem to offer any speed advantage.
Fix tests after rebase
Merge pull request #778 from mdboom/tests-faster

Made tests faster
Gtk3Agg does not in fact work on Python 3.
Add Palyer Data
PKGBUILD: implement check() which runs "make test" in /build
PKGBUILD: fix make check path.
Merge pull request #285 from matthiaskrgr/PKGBUILD

PKGBUILD: make check
UTIL::LIN::getCmdStdout(...) now reads from popen(...) correctly.
Fixing the errors cause by the last commit. This is very much a revert with minor changes."
Implemented getExecuteDir()
Made the getExecuteDir() function actually work
Fixed getExecutePath() - Should now return the correct path.
Regen BranchInfo for TYPE_LINKs on start, fix #223.
Don't bother saving BranchInfo for TYPE_LINKs.
Fix TYPE_LINK bittest on 64-bit only builds.

Only testing for the 32-bit flag fails when links are automatically
marked both 32- and 64-bit.
Clean up some trivial platform #ifdefs with BUILDID_PUBLIC.
Fixed download issues (but downloads my be slower)
clang: add -rdynamic only to linker flags
every abstract/generic class should have a virtual destructor
Fixed issues with multi threads access events
Fixed issue with crash on exit while uploading
cmake: add Boost Include Dir to test targets
cmake: it is called Boost_LIBRARY_DIR
Merge pull request #295 from lodle/cmake

cmake: add Boost Include Dir to test targets
Merge pull request #252 from lodle/bug190

maybe fixes Bug190

bug190 should occur less now
install-deps.sh: try to make debian part a little more save.
Olympics swimming prediction post started
Add statserv/server to example configuration
Just check pointer equality.
TryExec in session file causes odd issues on Fedora

Thanks David Sieg for reporting
https://groups.google.com/group/razor-qt/browse_thread/thread/9555a74cf7188ad2
Fix dbus race condition during startup

Usually, razor-session starts up really fast, and by the time time
modules start using the D-Bus interface (for canLogout), it is already
registered. However, in the debug.log I've found that in some rare cases
modules fail to connect to the iterface because it's not yet registered,
which would result in a missing Logout item.
Merge remote-tracking branch 'upstream/master'

Sync lasted oficial repo of razorqt
Add Authentication Dialog
added add and remove project
Security Icons: Make links clickable, change order of icons, and display throughout checkout process. Closes #159
Update sources/36-web2py-spanish-translation-in-progress/01.markmin
Update sources/36-web2py-spanish-translation-in-progress/01.markmin
Update sources/36-web2py-spanish-translation-in-progress/01.markmin
Chapter one first spanish translation
Merge branch 'master' of https://github.com/spametki/web2py-book
Update sources/29-web2py-english/08.markmin

Added reading emails with IMAP
Update sources/29-web2py-english/06.markmin

iamp -> imap
Added an IMAP file to resources
Removed a gnome desktop file
base con Estado Negociaciones..
Show git branch in footer within marmot theme
Default config.tpl
Cleanup of empty config.tpl
Remove work in progress headline de-bold text
Text bold again.
Merge pull request #1 from DaveTsunami/master

#8329 Changed text
Make media links optional #586
Add section to rule book about no correct answers. Closes #50

There can potentially be times when none of the possible answers
are correct. Add a section to the rule book discussing what
happens in this case.

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
Capistrano is needed on production too.
Doco

Change-Id: I110aef2e549bae7b5727e8429a125a3a4fb7126a
using PIE for IE compat
using PIE.htc for IE
SSL Proof of Concept Tests Added

The pom now generates a keystore with a trusted cert inside of it
updated SSL POC
Merge pull request #14 from mfullen/mfullen_v1_1

SSL Proof of Concept tests
hovers on bar plot
julians lame
Die Datenbank soweit...
verder aan ass8
Quicksearch basics
Added comments and type-ids for all the sys-integrators.
cannot click errors and go directly to them in editor
just some minor formatting and cleanup
Need to modify setup.py.in instead.
adjusted clearer to only remove/slide over visible filter elements
added additional height to applied learning subjects div to prevent 'pop' on slidedown
adjusted filters.js.coffee and loading.jst.eco to properly display only when projects haven't been loaded
Merge branch 'master' of github.com:mikesea/donors_select
Added build command
Merge branch 'master' of github.com:mikeyhu/scaladiagrams
Tomorrow light theme for Jetbrains.
Merge pull request #1 from milespomeroy/master

Tomorrow light for Jetbrains
fix unreadable settings on dark themes
update docs and tests to match v1.1.2
Removed Mako Templates, added Jinja2.
update to opam-0.7.3
update CHANGES to new format
REST installed
height adjust...
Added admix mountable engine
Adding more permissions and changing it so that admins can edit all games and user profiles
Adding roles view
[Client] Improved GUI
Added translations to the login screen
Improved layout of the login screen
Removed some redundant checks (resolution changed)
Improved readme
Improved detection of multiple mouse clicks in the GUI
Fixed variable sizes of dialog ID in input dialogs
Fixed loading mistake that prevented the client from starting a second time.
First cut at adding Ilene's design to RCRs.  Relationships are faked up and structure_or_genealogy is incomplete.
More work on details of xml parsing for EADs.
Fixed a bug discovered via tufts:sample002 -- transcript utterance tags were not being parsed and emitted into the page's transcript if their "who" attribute wasn't set.
Added another AudioText feature.
proper tab selection between show and tei reader
Changed live cell char from + back to *
fixed mistake on graph
Remove trailing whitespace
Merge pull request #10 from benmoss/whitespace

Remove trailing whitespace
added the readme (for USB stick) draft as I emailed it a few days ago.
(it may not yet be better than nothing.)
Sanjana,Sathish|OutPatientVisit migration included a field
Merge branch 'master' of github.com:motech/GHANA-National
Aravind | #00 | Formatting changes.
Ashish | #1842 | Changed diagnostics configuration
Duck | Trying to fix dependencies in contrib.
changing the groupid<praveen>
s13n
images
analytics code
tooltip view mode commented
min js versions added
changing to min version
using class visible
Remove B2G_PROF=1 since it doesn't do anything useful rs=cjones
Merge pull request #38 from dhylands/dhylands-remove-b2g-prof

Remove B2G_PROF=1 since it doesn't do anything useful rs=cjones
another gob decoder test
flesh out shut down clean-up
Remove false timeout path
Merge pull request #129 from zacc/fix-false-timeout

Remove false timeout path
a better name for this to reflect how it is being used
fix bug 756021, use host+port for db key
fix bug 756587, ensure manifest urls are same-origin if they are not builtin
fix bug 756195, provide a way to update db entries, allowing builtin manifests to be updated or overwritten by the providers real implementation
add comment on installManifest
make sure we use the key returned by the get call
Merge branch 'develop' of github.com:mozilla/socialapi-dev into develop
JSF # 015 # 00 : some progress made but still wip
JPA # 001 # 12 : minor fix now really works both ways (NOTE: obsolete commentary)
JPA # 001 # 12 : I managed to probe almost as deep as it goes and further refine the solution (both removal ways now work)
Pull out some important flags.
Check for duplicate location before adding.

Maybe I should just set a PK of pilot and date?
maket done
+
beginning of work on the scorecard and round starter
DapperRow now implements IDictionary<string, object> and all unit tests passes
added gitignore
Merge branch 'master' of github.com:mrbichel/obscura-rf12

Conflicts:
	.gitignore
initial
upgraded Rails to 3.0.7, rspec to 2.6, factory_girl to 3.1.0, updated tests with new factory syntax
provide a way for team to know its league. later we will allow a team to be in multiple leagues (like cups)
fixed searching to be case insensitive, still need to extract and create some search tests
missed a css class update for the remove button ala boostrap
first commit
info update
icon code added
Update text for personal projects.
Fix test failures on Python 3.2 caused by the printable names of types
being slightly different.
Revert "Removed panel and tbc.xib in favor of condensing files."

This reverts commit f778fd9ec3cd8798897caeb4b7b058d6caf98c83.
Revert "#29 - Add global options to further window/panel support"

This reverts commit f4fe3a9432b3dc7dacd82edb2d71ed9d814791c3.
Revert "Removed NSLogs"

This reverts commit cce24ca93e1e67a1c84724fef43e2a08aadf2933.
Revert "#29 - Add global options to further window/panel support"

This reverts commit fc1f074609493293ed0ab0821f3a478ba28a8a16.
remove unused field
remove unused imports
refactor handling of amount edittext into Activity subclass
Add more explanation about default for decimal separator
simplified/refactored
Alpha survey created and deploy ready
domain class added (Resource)
Did away with that weirdtree thing and substituted namespaces. Migrated Database to PDO. Added a log function
Renamed rotl64 macro to rol64.
remove debug print
add comment
Fix NSSaveDialog
bing culture is en for this project
Add Catalyst::Devel to carton for ease of development.
Store body sent to on external_body.
Made scripts use a symlink in repo user's home instead of $REPO_DIR
Clarify and hunt spelling mistakes
Make main README look nicer
Make install script create additional symlink and make README take account
Also update client-side config file to use one variable less
Merge branch 'next'

Conflicts:
	client/pullins
Added LAMBDA_RESTARTstate to so that we need not check state name in logic.  Fixes to Engine shutdown states.
Iteration over arrays
Basic iteration over collection
Changed ideas about how the syntax should look
Allow council members to see everyone on the live map
Add exact match tracking to search analytics
Add exact match output to csv file
Better safety check for additional details
Output long REST queries
Don't render mappings/notes
Don't load other sections via ajax
Show full stack trace for slow calls
Disable notes count
Remove notes counts
Fix caching issue when getting nodes
Return a blank node when id isn't passed in
Re-enable mappings
Disable note count for ajax
Get light concepts for new mapping form
Wrap note count span
Note about removing notes data
Move notes JS data to separate partial
Get light concepts for new mapping form
Add ajax call to get list of notes for concept
Need the JS data on the notes list too
Added Tessellator interface

Interface for Tessellator for future implementations
Vertex Layout Document
Start setting up redirect to outside of drupal (to fancy map).
Add city and state to json exports for artists and orgs.
Add more city and state fields. Update limits and data views settings.
Add help messages telling people their content will not be available.
Add redirect back up to the map after save.
Add slash before alias to better mirror what address plugin wants. It works either way but looks nicer this way.
Add server and basepath variables to loading functions in the action. Not working yet.
Add related play path to events data export.
Add generative artist path to events and plays.
Add artist path to plays also.
Remove node api redirect from Drupal to the map. Will be replaced with Javascript redirect to work with messages and facebook.
Refactor nodeapi call that sets the messages about redirecting and waiting for content from newplay_reference module to newplay_mapping module. Added a database update that sets the module weight below pathauto so that we have the path available to set the message.
Refactor nodeapi code to display redirect message. Put it in view instead of insert and update in order to get facebook links as well.
Set up javascript redirect functions. Only trigger it if the redirect message is present. Give it a new green style.
For the javascript redirect, move the count lower in the code so it actually starts at 10.
Remove debug code from javascript redirect code.
Fix typo in message to users after saving content that it will take a while to show up on the map.
Remove duplicate setTimeout call to redirect when viewing content. Fix arguments when calling the function the other time.
Add arguments to data views for nid.
Add another argument to events data view to show all events for a play.
add the team logo
Merge branch 'master' of https://github.com/nghialv2607/tomojisho
change style
Merge branch 'master' of github.com:nghialv2607/tomojisho
Add the Jax Touch module for touch screen tablets.
stamp is static
Use a string constant fmt for snprintf
Correct lengths
Use ungetc rather than special-casing newline
No need for timestamp to be global
Use linux kernel coding style
Allow compile and link to accept CFLAGS/LDFLAGS
Add tagalog tool: converts logs into JSON streams
Add test data
Add logatag tool: convert tagalog streams into logs
Add TODO
add a favicon to the document
tried new settings for sendgrid
email code done
Adding description in slider on instruction page
xmonad: adapt for matlab
More aggresive timeout
added user customer cust micrpost carpool classes all for trial purpose
[Atomic][Pre-0.5d] REBASED on FireMonkey platform.
[NEW] TMyImageList - new class for using grafics as in old (Vcl) TImageList.
For now it has only basic functional - you can only .Add, .GetBitmap,
.SetSize (Width and Height of images) and change the Count value.
You must to add images to resources (only with PNG flag for now).
I'll add some help summary when have a time for this.
Some changing in UAtomic (UGame now) source for FMX compability.
Glitches with small-turn images are fixed.
Load game FIXED - i broke it at v.0.4.2 o_O
Build - 0.5.4455.56209-debug
made corrections from jira
Added console arguments support
affichage note dans calendrier
tofrodos 1.7.12a

Update the formula to tofrodos 1.7.12a.

This fixes the download URL. tofrodos source archives have been removed
from SourceForge.

Closes #15332.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
ghc: 7.4.2 build from source

Following the discussion in #13519, ghc gets a major overhaul:

* Add a subformula that installs the ghc binary like before
* Use the ghc binary to build ghc from source
* Force ENV['LD'] = 'ld' to stop an assertion linking with llvm
* Add an option to run the testsuite. 9 unexpected fails atm
* Add a `j1` for an occasional install race
* Remove the patch which was fixed in two commits in Apr 2011.
        47ac5d859493ae0cd8dd02e1b4848f993acc3d5c
        a8d4731456ac3da0a70399e4ab821a763a4c04fb

Fixes #13519

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
ghc: add bottle.
libsvg: depends_on 'pkg-config'
MAME, MESS, and rom-tools: Update to 0.147

Closes #15341.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
InspIRCd 2.0.9

Closes #15337.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mobile-shell: add build dependency for automake

Closes #15333.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
swfmill: add missing dependencies

Fixes #15344.
asymptote: use userpaths

Fixes #15310.
python: For Xcode-only, add the the Tk header dir

Closes #15351.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
redis devel 2.6.0-rc8

Closes #15350.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
bibtex2html 1.97

Closes #15336.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Groovy 2.0.5

Closes #15355.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
jmeter 2.8

Closes #15357.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
opam 0.7.6

Closes #15358.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Wireshark 1.8.3

Closes #15361.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
elixir: silent version change

This closes #15353.

The fix was made by refreshing an existing git tag, so update the sha1.
chromedriver 23.0.1240.0

Closes #15365.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
subversion 1.7.7

Closes #15362.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
MINC 2.2.00

Closes #15356.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
P63 Composite
Removed the function with replaces SSH with dropbear.
added partner information
changes to handle new api delivery
added information for creating and submitting datasets
Initial coding completed (untested)
Removing version from AttachmentUploader.
Using carrierwave gem with CarrierWave::Mongoid class.
Removed reset request and last seen to reduce fetching. Storing
reset token and request date directly on the user eo.
WIP: restaurant optimizer
Added restaurant optimizer.
css changes... thoughts?
level 2 access
refactor Logging/Schema.php
partial updates to logging report from trunk
Start of the Inbox polling UI
Lightened popover text
from Jeff
Tweeked with styles and added IE7/8 support
Tweeked IE7/8 style
Popover style tweaking…. (still needs to be IE tested)
adjusted number badge to be flexible width.
Lightened popover text
from Jeff
Tweeked with styles and added IE7/8 support
Tweeked IE7/8 style
Popover style tweaking…. (still needs to be IE tested)
adjusted number badge to be flexible width.
Merge branch 'master' of https://github.com/nyslabor/UX-Prototype
Switch to use v8 SVN HEAD for normal use
Add lisence and pod

Signed-off-by: onevcat <onevcat@gmail.com>
Added a method to UNS, set_process_batch_key(), that the operator can use to set up the key to use to listen to batch_processing related timer events from the scheduler
got back what was lost in the merge
fixed a bug
Merge branch 'master' into batch_notification_scheduler
Merge pull request #191 from swarbhanu/batch_notification_scheduler

Integrated with the scheduler regarding the batch processing of notifications
[Fixed #31238501] Log websocket failure rather than raise socket error.
*** organized trail file for as400 app
Detect heroku and parse the DATABASE_URL environment variable
remove old code
synchronize XQuery and XSLT grammar parsers: both should return where the failure occurred if parsing fails through the r:no-match element
small fix to previous commit
missed variable declaration in grammar2.xsl2
corrections to bibliography schema/template
STML conversion: change in order of elements in bibliography for validity
update eXist to r16714
bibliographic API (closes #47 ) and tests (closes #48 )
Remove IME related source files

The removed files have been split to keyboard-efigs
and luna-webkit-api.

Open-webOS-DCO-1.0-Signed-off-by: Teppo Pennanen <teppo.pennanen@palm.com>

Change-Id: I29ce410c52aed40018282c3c3aebf43e2a69d0c9
Standardize --no-host-key-verify to --no-host-key-verification

Closes Pull #19
Check that sharing state works across levels
Level 1 and 2 descriptions in the same Description tree
Várias modificações

1) Adicionado documento final da entrega 1
2) Adicionado o projeto probike-ws
3) Adicionado o projeto de entidades canônicas
4) Adicionados os projetos de serviço
Basic content restore first rev
Moved around js and added require.js
Renamed jquery and modernizr
Removed script tags, all handled by requirejs now.
Moxie got a spine.
Refactored default java-mode style from work version
ORG to be CONTINUED
Merge branch 'master' of https://github.com/paryanto/TWGarageSale
removed ie stylesheet
B+ tree filesystem implemented, with still one bug to fix.
Added scene switching (a and c)
Basic styling and layout cleanup
Documentation improvements, Replaced prob22.sh with prob22.c
added first version id repo
Took out incorrect method
Update kwresearch settings to prevent breakage
CG Update
Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android
Commander Genius Update to Release 1.0
fixing some deprecated variable name on configure file
wrong false true condition
adding gsettings install on PKGBUILD
custom js alerts
Fixing sqlite-net issue #137.
Windows Store doesn't have InvariantCultureIgnoreCase, so use OrdinalIgnoreCase instead.
BoxCollector works with non-table grid layouts
stock price crawler added
link to contributors in README
change error handler to anonymous function
pimp the people finder
use included FactoryGirl syntax
Wrap some long lines
Prefix private variables and methods with underscore
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Coding style fixes
Translated using Weblate (Czech)

Currently translated at 100.0% (2607 of 2607)
Merge remote-tracking branch 'origin/master'
3.4.11-rc1
3.4.11 release
adding new trees to menus
more fixes to formatting
2012.09.02
properly remove thumbnail support
refactor moving logic to library
enable resizing, restoring windows will now use previous layout params
Fix wrong minVersion
git branch対応用ファイル
bash 利用方法
- added libsuffix patch to fix libOpenColorIO.a install path
Updated README with Nagios config examples.
add notes about requesting membership
Сделал проверку уникальности номеров мест в пределах одного автобуса
Merge pull request #1 from tawarisch/PIC18_master

Pic18 master
Merge branch 'PIC18_master'
fixed make test
- now, make clean is always called before test is executed

Refactoring
- extracted BlAddressRequest from BlReadRequest
refactored BlFlashEraseRequest and BlFlashCrc16Request
- made them inherit from BlAddressRequest to remove redunant code
Merge pull request #30 from tawarisch/master

Merge erst den anderen request!
updated html, css, and js
added images/js
Незначительные правки кода + крик души в виде guide.md
callable_symbol removing fixes
changed typo - type -> gtype
rebuilt docs
add in coverage stats
Changed to dicks
doing merge
Merge branch 'master' of https://github.com/psgraffiti/inf111-w12
Ability to download all the documents from DIP.
Remove news stories for now. 
Decruftification.
Document name changed to a shorter one
Finished Evo Scrape
Updated make_distance_* output files to match new file extensions.
Merge pull request #68 from jrrideout/qiime_issue_469

Updated make_distance_* output files to match new file extensions.
Squash a conditional
image pdf: include missing GetText module
image pdf: improve error message
post install configure
merging the oat server and client spec files into one
point logo at search
whitespace
action email form
cleanup
added adodb export methods
bump jquery to 1.8.2
jquery-ui autocomplete bundle
basic supporter downloader
better search
removing "container" div from header and footer, it doesn't work for some page layouts
[WIP][TASK] first version of inspector
Merge branch 'master' of github.com:radmiraal/TYPO3.TYPO3 into dev-master

Conflicts:
	Resources/Public/JavaScript/phoenix/content/model.js
Trying a new way to start the app.
Init Rails logger properly
Adding it to develop branch
BUG 9855 Rest Services for ProcessMaker.
PROBLEM There were no documentation for use of Rest by Curl and Rest with Java use.
SOLVED Adding Classes to help to use Rest by Curl and Adding samples to use Rest with Java.
api
fix merge
Tweaked Connect/Reconnect Logic and Logging

Simplified Connect member logic in JabbrClient.
Disabled exception logging for CheckIsConnected member in JabbrClient.
Disabled "Connection is established" logging in Jabbot.Console.
Improved reconnect logic in the AliveTimer callback.
Adding mysql-openstack cookbook, and updating role[mysql-master] to reference the wrapper cookbook.
Updating mysql-openstack submodule to latest version
Merge pull request #216 from galstrom21/sprint

Adding mysql-openstack cookbook
1st commit of readme
Remove my re-term as it is implemented in fnparse but undocumented
cleaned up postprocess.output namespace, removing unused functions
Merge branch 'develop' of github.com:reddmetrics/forma-clj into feature/postprocess-tests
added docs; removed a lot of extraneous functions and associated tests

fixed bug, induced by removing not-nil? function

fixed bug in post conditions and added tests for small examples

added docs, changed fact to facts
Merge pull request #140 from reddmetrics/feature/postprocess-tests

fixed postprocess.output namespace
Isolating rain issues
Adiciona README.md do repositório do Redu
Merge branch 'master' of github.com:redu/cruisecontrol.rb
shouldCall now maintains the run stack
allow format to be specified on command line
Automatic update [Sun Aug 12 18:09:20 CEST 2012].
Starting to redo the file loading system.
Starting to update the way the API framework works.
D3D9 needs to be updated to use a component model.
Formatint Source
Download / check user rights
Setting up database access for Travis.
fixed touch handling for childviews which are focusable
Move ruby-debug to development group.
add support for anonymous SMTP
new GUI push
job banner
Merge branch 'master' of github.com:revolunet/PythonBooks
Bump version number to 0.1.0 [ci skip]
Remove Deprecated Call-time pass-by-reference
Adding GA and Bundling High Charts
Updating config
addded partitioning query
updated distribution script
updated distribution script
updated distribution script again
For want of a self, the specs were lost
Merge branch 'azure_12_4_audit_filter'
[MIPS] Clean Kernel headers are generated by running
libc/kernel/tools/update_all.py script. This patch ignores
any changes to libc/kernel directory not related to MIPS
architecture.

Change-Id: I2c9e461dccb7c33eb4420be2db1a562f45137c8d
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>

Conflicts:

	libc/kernel/tools/defaults.py
[MIPS] Fix the warning originating from the kernel header signal.h.
This is a clean header generated from the corresponding change in
external/kernel-headers repository. (CL 35760)
MIPS support to libm, libdl and libthread_db

Change-Id: I9106721af7fe0cd45df82976250db0d300a20117
Signed-off-by: Raghu Gandham <raghu@mips.com>

Conflicts:

	libm/Android.mk
20/06/2012 23:25
Fix version in history.txt
The filters option is a no-op if passed with an empty array
Update history
Update options.rb

Fixing unterminated string
Incluindo uma homepage.
update package.json for release
Merge branch 'release/0.0.1'
Meta for responsive design
Adjusted autocomplete placemark name for when searching for localities
Merge branch 'master' of https://github.com/rome2rio/rome2rio-iOS

Pulling latest changes.
removed code to allow check to pass for now.
updated names from total impact to impact story
Creates some additional namespaces to hold the definition of entities in the game and the rules of the game
Adjusted xticks and yticks
Deprecate placeholder.
add methods for wg workaround
Update validates_formatting_of dependency to version 0.6.9
jeebus. i had it right before.
Add browser specific CSS3
Remove appcache loading bar
remove incorrect short PHP tag on hook call


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3842 c08608d7-6e46-0410-86ca-f2a6f1370df5
Can't have two elements with the same ID, so renamed one.



git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3843 c08608d7-6e46-0410-86ca-f2a6f1370df5
remote checked=true, since this is not valid html
--eeThis line, and those below, will be ignored--

M    searchbar.php


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3844 c08608d7-6e46-0410-86ca-f2a6f1370df5

ampersands should be escaped, even when used as part of URLs.


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3845 c08608d7-6e46-0410-86ca-f2a6f1370df5
don't show the closing body and html tags if in ajax mode (we didn't
show them in the header, so they are orphaned here.)



git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3846 c08608d7-6e46-0410-86ca-f2a6f1370df5

fix more stray ampersands and a few invalid labels. More to do here; in
HTML 5, label should only be used if it has a for
form element. We're using it to apply styles.


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3847 c08608d7-6e46-0410-86ca-f2a6f1370df5

hopefully fixed structural problem with divs in edit.php that was
preventing the page from loading correctly using ajax in IE


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3848 c08608d7-6e46-0410-86ca-f2a6f1370df5

configure jquery to prevent browsers from ever caching ajax requests


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3849 c08608d7-6e46-0410-86ca-f2a6f1370df5
fix for get_themes order_by... getting order_by from url sometimes gives invalid values for collection ordering

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3850 c08608d7-6e46-0410-86ca-f2a6f1370df5
corresponding fix for themes.php, last commit

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3851 c08608d7-6e46-0410-86ca-f2a6f1370df5
another attempt at fixing gallery order bys

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3852 c08608d7-6e46-0410-86ca-f2a6f1370df5

use crop box when generating PDF previews. This prevents PDFs that have
been cropped from having massive white borders; matches behavior to
Adobe Acrobat


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3853 c08608d7-6e46-0410-86ca-f2a6f1370df5
fix for collection_edit_previews as ref wasn't being passed with new form action

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3854 c08608d7-6e46-0410-86ca-f2a6f1370df5
Initial commit
Merge branch 'master' of github.com:rzamana/resourcespace
imploved file open keymap
NOJIRA commons-io was all of a sudden missing. restored so it would compile

git-svn-id: https://source.sakaiproject.org/svn/profile2/trunk@116773 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAKIII-6148 - fix sign-in links
Merge pull request #2467 from stuartf/SAKIII-6148

SAKIII-6148 - fix sign-in links
SAKIII-5413 Collection Viewer doc/collection header exposes features only on hover

Squashed commit of the following:

commit 9890efa5d23dfdb3784b8c563566d77e597c7fdc
Merge: 90653b7 2c7b2e3
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu May 3 18:00:02 2012 -0700

    Merge remote-tracking branch 'elicochran/SAKIII-5413' into elicochran-SAKIII-5413

commit 2c7b2e358a4c44d30bc6215c3c6fe5abc4ae52da
Author: Eli Cochran <eli@media.berkeley.edu>
Date:   Wed May 2 15:17:21 2012 -0700

    SAKIII-5413: removed the hover behavior that hides and shows the "extra" actions on a collection element
Merge pull request #2050 from elicochran/SAKIII-5413

SAKIII-5413 Collection Viewer doc/collection header exposes features only on hover
KERN-2803: ProfileServiceImpl.handleNode(Content, Map, Map) checks for Content path in baseMap, when actually Content is expected
Merge pull request #762 from savithap/kern-2803

KERN-2803: ProfileServiceImpl.handleNode(Content, Map, Map) checks for C...
Decision Tree Classifier GUI Updated

The updated GUI now displays sliders that the user can use to vary the
Crossover and Mutation Probabilities. The samples from the selected
dataset are displayed in a Table Widget. After the Genetic Algorithm has
completed its iterations, the result is displayed in a small text area.
Also, the misclassified examples are displayed in "red" color in the
table.
ANimations in main menu
maps have a SHORT NAME (PB, SB, etc..)
login and sign up working
some tile rendering improvements, added entities / mobs / players, automatically centering to player
move curl up
014 Local Web Servers
Adicionado suporte ao Travis-ci
Corrigida a verificação que exibe ou não os links de download do livro
Merge pull request #29 from gustavofonseca/master

Corrigida a verificação que exibe ou não os links de download do livro
[2653] Drop more gossip scripts - will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2758] Implement script for Scarlet Ghoul (quest Gift that keeps on giving 12698)
windresize
Add check for directory
update client-sessions to 0.0.8

this has a new version of node-proxy, that uses
node-gyp and can therefore compile on Windows
repo0_20120602
Merge branch 'master' of github.com:search-sam/Lenguaje-C
[t1784] review fix
[t1797] timeline working again

1. Fixed bug in trackevent preventing 0 times from working (possible dragndrop values).
2. Cleaned up dragndrop module a bit to compensate for id-less elements.
3. Removed console.log that were not necessary.
[t1797] timeline droppable reactivated
[t1797] couple of timeline bug fixes
[t766] Fixing broken youtube export

1. Updated popcorn
2. Got rid of tests functions breaking export
3. Fixed media export for non audio/video elements (empties them :/)
testing if refreshing google token works
minor fix
rendering google request response status
Fixed events place edit
expand test coverage; add error-handling for date functions and invalid string inputs
dashboard example links now customizable bu translators
added some more console logins
Changes in getMovie function
Test message broadcasting
lines between springs. Nice for visualizing.
dividing force by mass, durr.
绑定apache虚拟主机域名的脚本
Balanced CPT construction.
Added example for balanced CPT construction.
remove debug code.
Added comments for paper reference.
use SG_SPRINT instead of printf
Merge branch 'multiclass' of git://github.com/pluskid/shogun
Made JLCoverTree parameters static
A few fixes for malsar based algorithms
Allow blank post image & set meaningful model instance name
For some reason I kept getting null exception. Solution a null check at start of all frames ready method.
Added viewhost page and some logic
Extracted javascript to a separate file. Refactored some files
Enabled phone numbers of Companies as well
commiting changes
Enabled email address fields for all contacts. Also have scaffold for notes set up
Merge branch 'tom' of github.com:sicophrenic/CS169-ICA into tom
Merge branch 'tom' into terri

Conflicts:
	app/controllers/companies_controller.rb
cucumber features search up, new and edit partially up
Fix getopt invalid argument character.

Thanks @telemachus.
Added 3.0.2-rc1 docs
Added correct CSS class to GroupedDropdownField
Corrections to composer docs for update and install
Update ideal commit message to reflect new guidelines
Added some animation effects
Fin de la partie contributing - relues
Translation
Translation
Translation
Translation
Translation
Merge pull request #54 from nicodmf/contributing

Fin de la partie contributing - relues
Rereading and fixing typos
Corrections et reformulations
Fix typos
Fix typos
Fix typos
Fix typos
updating from symfony-docs
translation of constraints files, second part
fixes new client creating
added a line in mavlink to set the mode in global_data_skye
Added the start of syntax highlighting, fixed bugs
in the parsing code for sequence with handling of comments
Added bug to TODO
Refactored playlist tests

Rethinking the spec for the playlist class in hopes of making them a bit
more robust.
Removed crazily placed require.

WTF?
Removed unnecessary rspec reference
Added Fakeweb for testing
Fixed bug that didn't allow videoids with dashes
Version bump
add d710 support

Change-Id: If4bf6fbb7dac5a993f4402b3a42b963783ce11bc
Fix to cell==null
Default params
Constructor tweaks
added pycon talk proposal to the blog
manual upload of html changes
1.0.2 セーフモードの不具合修正と、アイコンリンクの追加。
1.1.0 先読み機能の実装
1.1.0 先読み機能の実装
imp Guardado objeto SurferProxy al inicio de sesion
imp Solo se puede acceder a URLs internas cuando se esta registrado (excepto Home)
imp Name y email obtenidos del objeto surfer en el Profile
OPEN - task 2: Server - migrar de appengine + datanucleus a jetty +
hibernate 
https://github.com/socialwind/socialwind/issues/issues/issue/2
That one's not there.
prevent NPE if null replace values with an empty String
[maven-release-plugin] prepare release plexus-utils-3.0.2
License Creative Commons Atribución NoComercial ShareEqual 3.0 added
WOBS-1072: reworking of flipside-functionality

Done.
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:newscoop into wobs-reloaded
WOBS-1167: templatechanges to movies and events on TagesWoche
* mostly movie-lists
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:campsite into wobs-reloaded
WOBS-1206: Changes to ticker on front and section pages

Update author markup.
Merge branch 'wobs-reloaded' of code.sourcefabric.org:newscoop into wobs-reloaded
Initial commit
Rails::BareApplication
Finished conf home table
add basic user routing.
Removed duplicate logic.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@171218 91177308-0d34-0410-b5e6-96231b3b80d8
Follow up on llvm r164132.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164133 91177308-0d34-0410-b5e6-96231b3b80d8
Factor out the code retrieves the last PIC related argument from
the Clang::ConstructJob() to the new ArgList::getLastArg() routine
with eight argument. That simplifies reusing of this code.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@157633 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Extract AsmStmt handling into a separate file, so as to not
pollute SemaStmt with extraneous asm handling logic.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@162132 91177308-0d34-0410-b5e6-96231b3b80d8
Part of PR13618: visit the TypeLoc when RecursiveASTVisitor visits a CompoundLiteralExpr.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@162133 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Update comment.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@162134 91177308-0d34-0410-b5e6-96231b3b80d8
c: privide deprecated warning when __private_extern__ storage
specifier is unsed in a declaration; as it may not make the symbol
local to linkage unit as intended. Suggest using "hidden" visibility 
attribute instead. // rdar://7703982


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@162138 91177308-0d34-0410-b5e6-96231b3b80d8
Add support for MIPS' floating ABIs (hard, soft and single) to clang driver.

Patch by Simon Atanasyan.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153348 91177308-0d34-0410-b5e6-96231b3b80d8
When defining a forward-declared enum, don't try to attach the definition to
a previous declaration if the redeclaration is invalid. That way lies madness.
Fixes a crash-on-invalid reported by Abramo.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153349 91177308-0d34-0410-b5e6-96231b3b80d8
Revert accidentally-committed www changes (and an unused diagnostic);
forward-declared enums aren't /quite/ done yet.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153350 91177308-0d34-0410-b5e6-96231b3b80d8
[libclang] Make sure we don't crash when trying to index code that
managed to insert an @interface as top level decl contained by another
@interface.

A commit to also not allow this as valid code will be coming.

rdar://11105114.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153354 91177308-0d34-0410-b5e6-96231b3b80d8
Make sure we don't accept an @interface inside another objc container
just because there was an attribute in front of it.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153355 91177308-0d34-0410-b5e6-96231b3b80d8
use EP_OptimizerLast instead of EP_ScalarOptimizerLate for ThreadSanitizer

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153356 91177308-0d34-0410-b5e6-96231b3b80d8
Teach APValue printer to print boolean 0 and 1 as 'false' and 'true'. Fix up
some calling code to actually pass in a non-null type, to avoid a crash.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153358 91177308-0d34-0410-b5e6-96231b3b80d8
80-column violations and whitespace.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160017 91177308-0d34-0410-b5e6-96231b3b80d8
Thread safety analysis: impove handling of trylock expressions.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160018 91177308-0d34-0410-b5e6-96231b3b80d8
[libclang] Introduce clang_Cursor_getObjCSelectorIndex() function.

After getting a cursor with clang_getCursor for a particular source location,
allows querying the cursor in order to find out if the location points to a
selector identifier in an objc method or message expression, and which selector index it is.

rdar://11158946

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153781 91177308-0d34-0410-b5e6-96231b3b80d8
PR12224 (sort of): Diagnose inheriting constructor declarations in C++11 mode.
We do not support IRGen for these, and get some parts of the semantic analysis
wrong.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155728 91177308-0d34-0410-b5e6-96231b3b80d8
[driver] Don't try to set the deployment target when there is no bound
architecture; this was happening for tools such as lipo and dsymutil.
Also, if no -arch option has been specified, set the architecture based
on the TC default.
rdar://11329656


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155730 91177308-0d34-0410-b5e6-96231b3b80d8
US1451 : TA2193 Provision of VM for Jenkins (CI). Added installpuppet.sh script and modified initprovision.sh script to run it.
Shield duration upped to 6 seconds
Engine load issue
Added custom provider zabbixagent
up to p174
Full support for multiple instances.

Staying backwards compatible for now, but will break that in 2.0
new template Bootstrap
Clarified payment processing. Added cc to options.
fix specifity
change tests for pseudo element
tests clenup
Add if to catch un-intialized variables
10 Stars in display
+++ devise in gemfile
new grasses (savanna,jungle) recolored
Forcefully clean previously build packages
Ignore pyc files
Bug 53655: Add cmdopts to VDD

This change adds three command options to VDD for use in the config file:
blocklistfile, restartcount, and restarttest.

Testing done:

Ran VDD with the above cmdopts in soda-config.xml.  Verified that they were
processed.
Fix exception in windowExists

If windowExists is called when using the IE driver and all windows are
closed, a WebDriverException is thrown by WebDriver.  This change catches
the exception and returns false (indicating the window does not exist).

Testing done:

Ran a script with <browser action="close"/> against, firefox, chrome, and
IE.
Updating README with a better description and to introduce the string "Voodoo Driver" with a space in it a few times for search engines.
Merge branch 'dev' into dev_v2
Make attach event work

Now that the link event is functional, the attach event can be tested.  This
change fixes the issues discovered during that testing.  The attach event is
now fully functional.

Testing done:

VDD regression suite misc test.
Merge branch 'dev' into dev_v2
* risolto bug [punto 4]
final fix of templates
added nullable for result
it now gives a warning if the initial query returns nothing
added toggle boxxes (don't do anything yet)
Removing redundant example, was renamed

git-svn-id: http://processing.googlecode.com/svn/trunk@10573 fe3ceab9-de17-3b67-bb2e-7d58edd5e4d6
Quelques modifications au niveau du gel des fonctions.
[vim] vimfilerの設定追加

かなりつかいやすくなった！
[vim]
Merge pull request #48 from tarsius/master

theme mic-paren
made the which-func face a bit more distinctive
Merge branch 'master' of github.com:bbatsov/zenburn-emacs
enforce disabling indent-tabs-mode
helm: don't underline anything

also untabify edited region
Nog meer problemen opgelost betreffend ehet synchronizatiesysteem en
wijzigingenmail
added new search plugin grepping DefaultIO texts directly. #32
Rename test to tests.
Rename test.sh to test-dotploy.sh
Remove static test structure, set them up on the fly.
Move :checkout-deps-shares to default profile.

This will prevent checkout deps from being used when just the
production profile is active. Also, this may be the first legitimate
use of flatten I've ever seen.
Fix a leiningen-core project test case
Merge pull request #877 from balinterdi/fix-project-repositories-test-case

Fix a leiningen-core project test case
fixed the change symbol button bug in graduated renderer
agregando causa justa a los banners
Update lxc-create.sgml.in to lxc-0.8.0.
website transition page
oops now updated readme
The addition of the legend is complete.  I think the first iteration is finished.
changed featured
added comments
added comments
Merge https://github.com/thaidi/Scrolling_Amit
Forgot the dep on jsonrpc
use absolute path for recursively found modules

If we find a module recursively and it resides in the current directory,
we have to use the abolute path.
Merge https://github.com/discoproject/disco
Avoid installing non-essential (e.g. test-specific) dependencies.
Revert to earlier manifest for debian packages.
Fix install target to handle re-installs.
Remove some dead config params.
Group together config params related to tag cache.
Handle +deleted tag properly when GC/RR retrieves tag list.
Removed unused state var.
Update node-local tag cache on completion of GC.
Update master tag cache on completion of GC.
Update and clarify the comments in ddfs/config.hrl.
Fix make install target idiomatically.
Switched DDFS logging to native lager.
Switched DDFS logging to native lager.
Update lager to latest as suggested by Kostis.
Merge branch 'fix-debian2' into fix-lager-log
Use tagged version of lager 1.0.0 as opposed to head.
Fix a format error.
Fix another format error.
Amazeballs!

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>
Amazeballs 2. Now even rounder!

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>
Add the "encoding" attribute and use it.

To encode and decode config files. Necessary because, if no encoding is
specified, and a UTF-8 string is saved to a config file, when it is read back
in, it will not be properly read as UTF-8. The same would go for any coding
other than Latin-1 (maybe).
 Factor out slurp and burp into testing methods
Enforce that all keys must have sections

Previously, git correctly parsed configuration variables before the
first section marker, although it coult not set or unset such keys.  In
git 1.7.4.4 and later, the code was modified to match the documentation,
and this misfeature was removed.

Alter the parsing code and methods to enforce this restriction in the
module as well, for consistency with git.
Move add_comment POD to a more sensible place
Ignore generated MYMETA files
Version 1.09 releng
Rearranged some stuff (was tired last night).
Bump to 0.1.5-1
Corrigido o problema da movimentação dos elementos na tela
Merge branch 'master' of github.com:thiagodnf/QtBSTOpenGL
Corrigido o bug de movimentação da arvore e adicionado a action Exit no menu File
Add `defproject` to 'lispwords'
Refresh and server url configuration
Mapping object is an object not an array
Handle deleted Salesforce entities when updating a Drupal entity. Closes #55.
GPL'd robosim
Cleanup and style tweaks
Fixed various bogosity with shake animation bounds.
Site updated at 2012-08-30 22:40:54 UTC
Added table totals - closes #10
Fixing docs for timrwood/moment#450
Merge https://github.com/vfloz/cloudfuse
Fix openfile struct memory leak
Merge commit '5d0ad696170f5c42a80e2755bfb3bf9cfd6eea55'
Visibility declarations and cleanup for CI_DB_oci8_driver
Visibility declarations and cleanup for OCI8 result, forge and utility classes
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
add asset copy function for AssetActivity
WAR package
alright, so the project is taking a different direction. Instead of python as a scripting language we are going to use javascript.
Prefer param substitution over test for runtime vars
Add paging to API calls
use present rather than not empty for clarity
Add ISO8601 date function, because I spend ages figuring it out often
Use more granular keys
fixed regression of layouting preview
adding support to define custom scene setup
adding example for a custom scene setup usage
adding scene as a valid selection
adding scene as container
implemented custom window decoration
removed debug message
adding custom decoration
modified definition of decoration support
fixed decoration naming
adjusted package path
fixed keybinding duplication
actie op portal-link gezet
tekst van shadowbox is nu wit
Added class_or_instance properties
Aside li is restricted to pill box.
Add documentation for "Getting and setting the current state"