labofsahil/github-event-dataset-2012 huggingface dataset:
DH: changing prompt to style in https://github.com/nodemaker/dotfiles/blob/master/.bash_prompt
Added .rspec
Refactor and simplify the gem
More refactoring, flesh out tests
Simplify config and update readme
add ds_store to gitignore
Added references for JAXB generation
Added reference for rrd4j
Added teachers implementation of rrd4j
Merge branch 'master' of https://github.com/davidpcruz/MSE-EAI.git

Conflicts:
	Project1/.classpath
Added Travis, updated README.
Changed links from CodePlex to Github in the documentation.
Changed form in login
Add category for Bryan
Actualizacion final 17/OCT/12
separate out statement so it 's not all on one line
refactoring the wikis
finished big refactor
Merge branch 'refactor-wikis'
Fixed 2 bugs in my parser. this and atoi/itoa base on SyntaxTortureTest.kxi
Final cleanup. Moving on.
Formatting
Added skeleton for SyncQueue
Can import Facebook data from JSON
ref TODO
Saving to transfer to laptop
TU-217 - Create Product Description document.
Added Key Product Features and Capabilities
TU-126 - Clarification reply processing
Coded Correlation.scala
one extension directory for safari and chrme
update CUDA
Myyntipvm mukaan selectiin.
Vaihdetaan masteriin ja siivotaan turhat branchit veks.
Päivitetään lapsirivi
Merge branch 'master' into jamppa/uusilahetetyyppi
Uusi lähetetyyppi!
Merge pull request #156 from devlab-oy/jamppa/uusilahetetyyppi

Uusi lähetetyyppi joka mahdollistaa tulostamaan EAN-viivakoodin
Etsi-toiminnolla katsotaan löytyykö otunnus like %tilausnro, koska ensimmäinen merkki saattaa puuttua.
Verollisuus-alasvetovalikot.
Voidaan päivittää referenssiin ilman että järjestyksiä sorkitaan.

Mahdollistaa sen, että käyttäjän asettamat omat järjestykset säilyy koskemattomana.
Yhtiöt nollataan, että ei tule vanhoja queryyn.
Laitetaan formeihin actionit, muuten lähtee pyörimään väärän urlin ympärille.
Korjaus!
Merge pull request #342 from devlab-oy/tony/synkronoireferenssiin

Synkronoi referenssiin ei sotke järjestyksiä
Ei tulosteta terminaaliosoitelappuja jos lämpösiirto.
automated commit from dev@dmehta Mon Oct 15 00:00:01 EDT 2012
automated commit from dev@dmehta Tue Oct 30 06:00:01 EDT 2012
Added Gradle settings
checked off TODO item
fixed lots of tests to reflect improved error construction during
compilation
predefined rules now print on their own line during description if
marked as explicit
Detalles mapa index
subir imagenes
Muchas imagenes
Merge limpio
imagenes en index, subir muchas imagenes
Mapa power
eliminamos procfile copia
Merge rulo devel
Correccion Modelo version final
Eliminar carpeta DB
usuarios bien
#Fix practice chart legends
Merge branch 'practice_level_integration' into test_server_alt
Site updated at 2012-09-08 02:02:51 UTC
Site updated at 2012-09-08 03:36:20 UTC
TDKR or TASM
Updating README.

Signed-off-by: Sean Nolen <smn.github@forgetingtolive.com>
sublime projects
clicking a marker to open an infowindow closes all other infowindows on the map
Fix installation with ruby 1.9

This commit makes possible to install ruby-rpm via gem on systems
using ruby 1.9.
Merge pull request #1 from flavio/fix_install_with_ruby19

Fix installation with ruby 1.9
doc: fix indent
Merge pull request #2 from wkeese/doc

doc: fix indent etc.
Add the BSD license copyright
Add EntityLoader and BeanMapper
[DDC-1695] Fix bug in SQL Walker array hydration with escaped fields.
Merge branch 'DDC-1695' into 2.2
Missing logic for non-array returned ID generators: UUID and sequence.
Cleanup UPDATE.md chapter mess a bit
added more tests
added sql types validation
Completegit add *git add *
Merge pull request #64 from doktorj/master

fixed potentially major admin bug with some mats not saving + cleanup
Style and structure updates on show and left nav
Merge pull request #65 from placeboArts/master

Style and structure updates on show and left nav
added new find_by_sql scope for newly_crafted_sidebar, plus moved a bunch of controller logic into the model and used instance variables instead (fat model/skinny controller best practice) + added mat type to all left sidebar links
Added stricter value checking on number.
Dodano plik .gitignore

... o następującym charakterze : ignoruj wszystko by default
a jak czegoś ma nie ignorować to mu trzeba explicite o tym powiedzieć.
Initial work pulling in Symfony components
Merge pull request #10 from donny-dont/master

Rename immediateContext to context in spectre_post
Merge pull request #11 from donny-dont/master

Update to new library/import/source syntax
Fix slowdown in removing lines from debug draw manager.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Add pong like example.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Use scaled method.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
noise
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project
Begin to reduce garbage generated by debug draw manager.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Cleanup for post M1 library changes
Fix bug - If the page loads without any transactions, you can't change the date range.
Turns out we don't need to configure the shell script after all.  Make a separate shell script with the variable definitions in it instead.
Source ~/db.intersango.sh to get database credentials for making backups.  The same file defines $USER too.
#13 - Fixed URL encoding from SoundCloudProvider
Floor that slide width yo
added css
now uses css
Update templates/vhost/vhost_footer.erb
rename readme
remove configs
remove task module
add core module
update class module with new core
update trunk class with new core
update logger module with new core
update events module with new core
add controller adaptor
making it work counter clockwise
more shiny future
Refactored QuickContactactsTableViewController
Refactored QuickContactsTableViewController
IMPORT (elliptic): Decrease the number of Pandemonium lords on ziggurat levels slightly.

 This is compensation for the Pan monster set being much nastier than the Abyss
 monster set.
Invert "unless .empty?" to "if .present?"; unless-else is evil.
Handle MR "show all commits" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
Update to the latst grit

The latest grit includes a patch for performance improvements.
Update Gemfile.lock as well
Merge pull request #947 from netdata/Update_gemfile_for_latest_grit

Update to the latest grit
Update pygments version
Handle Commit "show suppressed diff" link with a doc-ready event handler.

Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
make a hyperlink from the counted keys

Refs Ticket #948
Merge pull request #950 from netdata/Create_link_from_keys_count

make a hyperlink from the counted keys
Hande error with huge commits
Merge pull request #951 from robbkidd/remove_link_to_function

Replace calls to deprecated link_to_function with doc-ready functions.
Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil."

This reverts commit 7484bcfff7fc8e132d94701b3af47f521ce117c5.
Revert "Handle MR "show all commits" link with a doc-ready event handler."

This reverts commit 5b1ede628065ecfdf95552322328b5bb7613753a.
Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler."

This reverts commit ef1598b4afa94b21db7f38755182a701d03ae44a.
New IssueObserver class and spec.

Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.
Add new utility method for an issue to know whether it is being reassigned
Update IssueObserver to send reassigned emails when an issue is reassigned.
Add method to Note to create notes about status changes.
Add method for an issue to know whether it is being closed

Update IssueObserver to create a Note on the issue its being closed.
Make IssueObserver handle issus, not MailerObserver
Vim file mv functions
Vim powerline
add parse-mm-results, main-DumpPattern
fix ucb1 (to be greedy), add benchmark results
nfi, look at files. probalby something minor
New version of library.
update ruby-thin 1.3.1 -> 1.4.1
getElementsByAttribute
Simplify the design.
added (mn) Macedonian language to chm terms importer

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/naaya.chm@19207 a0171fae-0946-0410-966d-b1775066cd26
added Macedonian translations to chm terms

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/naaya.chm@19208 a0171fae-0946-0410-966d-b1775066cd26
list of donators
Added HTML Certificates for Commissioning and Attendnace
add raphael graphing library
Update laravel/auth/drivers/eloquent.php

When you've changed the 'User' model key to something different to 'id' it doesn't work.
Added README
Added some files
Fixed camera. Simplified XML output for vectors. Camera now
saves/loads from scene file, removed pointless printouts.
Cleaned up my head
Grammar edit.

Added a comma to line 5.
Add WFI to PASS to allow system sleep
Add users that join after bot is launched to user tracking etc,.
reverting this since honza fixed something i don't understand
the same primary key field as in contrib.comments
Add recipe for confluence-el
Merge pull request #770 from shellbj/confluence-el

Add recipe for confluence-el
Support native GnuTLS for STARTTLS

Emacs 24 supports linking to the GnuTLS library.  Let's use it when
available.

Also add a customisable variable for ignoring invalid certificates.
We should now be validating certificates against the XMPP server name,
not the hostname from DNS SRV, so there should be less need for this
now, but there's always the occasional basement server with a
self-signed certificate...
! Admin search searches the wiki instead of the online manual [Bug 4747]
SSL verification updates
Fix def file
Add jquery datepicket to the date of birth fields on the registration
page.
Add the event link to the race.
Update version.
List races
Kohana

added Kohana modules and system
Tweaked main page
isValid now takes an optional 'options' parameter that gets passed through to validate. Needed so one can test validation under a variety of contexts
Added start time for topics
Added start time sql and in JSON generation
linkedin orto mistake
Speed up board rendering, add spin.js, fix bugs
"deleted some files"
Bump escalus commit to use esl/lxmppc and esl/exml
add labels to tree nodes
Created a "Profile" page.

Created the corresponding view and url and a link to it from the stories template.

This page will need a lot of development but it's a start.
added the import name for the Scope presentation
matching xml attribute values based on regular expressions
added a NameSpace trait to be able to scope fragments in a mutable specification
added comments in the user guide for the new filesrunner options
Json brainstorm
json.object.description
New DbRequest api
Fix translations of placeholder attrs. For #5809.
Added VERSION file for the update manager.
Show duration for podcast
UI-2171: [PLF4] - Icon - Update case buton:hover have icon
try commit from c9.io
REST: PHPDoc fix
REST: Remove duplicated code for names/descriptions visiting in object state (group)
EZP-20051: Setting an empty value to a required field won't trigger a ContentValidationException
Merge pull request #135 from patrickallaert/EZP-20051

EZP-20051: Setting an empty value to a required field won't trigger a Co...
REST: Fix element name of policy list in Role visitor
REST: Fix relation visitor according to XSD
REST: Update object state & object state group visitor to match XSD
Revert "Fixed type hint in FieldType interface"

This reverts commit 37a0db73cd672ba5666db3e3788a5c4c91df7ac3.
Revert "FieldType interface: added typehint to toHash + doc fixes"

This reverts commit 42ae41206560bb53815879a2cac05235d7e6d5e0.
update TODO list based on rekey brainstorm

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
manpage for flinn-engdahl script
update: capture exit status of child processes

This probably won't fail, but it's important to know if a child did
(e.g. in the case of ENOSPC errors) for the exit status.
update: align total DL stats with incremental progress

Change the brackets to make sure this still stands out
pkgfile: whitespace fixes
pkgfile: unify language for mutually exclusive options
pkgfile: allow optarg with --compress shortopt, -z
Image download progress

Added delegate method for calling back progress of the image download.
Merge pull request #234 from fannheyward/master

Fix import error in Xcode 4.3
Merge pull request #233 from stevewilford/master

NINetworkImageView download progress
[photos] Remove overzealous assertion when assigning nil images to the photo scroll view.
[attributedlabel] Links now have a gutter area.

Fingers are clumsy. Sometimes, when you tap a link, your finger will
move subtly right as you're lifting your finger, causing the attributed
label to think that you moved away from the link and that no tap should
be registered.

A "gutter" introduces a 22px padding on all sides of the tapped link.
Touches within this gutter will still register as touches within the
link, even if your finger is actually physically within a different link.

This "feels" right because we highlight the originally-tapped link to
let the user know which link is active.

This addresses some potential issues related to issue #236.
[catalog] Make the Nimbus sample app target iOS 5.0.
[thirdparty] Update AFNetworking.
[attributedlabel] Remove deprecation macro.
[catalog] Fix build errors in Xcode 4.3.3.
[launcher] Fix potential error on Xcode 4.2.

Closes #237.
[models] Grouped cell background renderer.
[models] Add NIDrawRectBlockCellObject for rendering cells with blocks.
[catalog] Add a basic instantiation example of table view models.
[catalog] Add sectioned table view model example.
[catalog] Add index table model example.
[catalog] Add form cell catalog.
Delete the ModelCatalog example project. All code is now in the Nimbus Catalog.
[catalog] Add radio group example.
[catalog] Add delegate example to the radio group example.
[catalog] Add nested radio group example.
Merge branch 'development' into group1
Changed AbstractCountry fields to be protected not private, so inherited classes can use them
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
fixed CanadaAgent constructor argument types
Fixed EUCountry constructor arg types
Merge branch 'group1' into development
Merge branch 'development' into group3
Added getter in CarbonReportingService. Updated PCRService. Changed name for token generation in Token interface to avoid ambiguity
Merge branch 'group3' into development
Merge branch 'development' into testtrade2
Added simple test for Trade class (within trade protocol) for ensuring reverse and equals are correct
Cleaned up includes
moved first test to test folder
TODO in TradeProtocolTest
Merge branch 'development' into group1
Added cashService class to manage GDP growth access
Merge branch 'development' into group1
Fixed a few issues in AbstractPostCommunistCountry
small changes to functions
Changed the model to calculate the InternalPrice for which we sell
small changes
Added the calculation of lastYearFactor
Added exception handling and some boundary checkers to AbstractPostCommunistCountry
cleaning up functions, try/catch blocks, merge two functions to calculate lastYearFactor
written calculateFossilFuelsFactor function
Merge branch 'group3' into development
Merge development to group1
Merge branch 'group1' of github.com:farhanrahman/kyoto into group1
Initial monitoring agent
Changed the way commenting is done. Fixed a few issues with imported libraries
Removed execute lock. seems to be an issue with longer simulations
Canada behaviour function
Canada behaviour function modified
Added US initialise data
Annex1Sustain
Merge branch 'development' into group2
aula 11 completa
Remove the hello.txt
T'es mauvais JACK !!!!!!!!!!!!!!
Shoot only to fast incoming bullets
What's highscore mean? That's right points for every zombie head.
Just messing around at the moment
better logic for research / consumer devices
prepare for use of cibuddy
Refactored a bunch of shit.
Refactored ScoreBoost API

- ScoreBoost.extend -> ScoreBoost.boost
- ScoreBoost.elasticExtend -> ScoreBoost.elasticBoost

Also renamed all "boost" fields to be called "weight" instead.
Added Query API docstrings.

Also killed commented out code:

https://gist.github.com/10d1430e28b504b3baff
Finished refactoring / doccing Ast.scala.
Added some docs to Schema.scala.
Added StringListField.contains and unit tests.
Added LongListField(.contains) and unit tests.
Added feedback based on Pull Request 12

See discussion at:
- https://github.com/foursquare/slashem/pull/12
Fixed feedback from pullrequest, final commit.
Updated _posts/2012-07-31-about.md
Updated _posts/supporters/2012-08-29-voice-project.md
[maven-release-plugin] prepare release webframe-1.2.0
Implement writing playlists to temp directory
Detailed tracking of online users
simplified API + ORM removed
use rbenv init instead
Fix for ByteCountOutputStream stack overflow bug.  
Merge pull request #1 from yarrumretep/master

Stack overflow bug with ByteCountOutputStream
Add missing closing quote marks
reveal card from the top of library and put it either in play or in graveyard
Fixes for awl/sge.
wip: bug #1567 - Foreman-proxy ignores dhcps.conf include directive
Removing php server alias in favor of a standalone script
reorder a little code
Removed html template injection - not necessary as templates are just lists of divs, and also googlemap plugin requires all html to be
in place when the events are initialised.

Added GoogelMap event - just a wrapper for the googlemap plugin
add user cloud portlet
let the BasetypeAccessor also set the behaviors for elements features
Merge branch 'master' of git://github.com/g24at/g24.elements
Botoes de conteúdo passados para área superior da página
240912 10:14

will it works from lenovo?
ISPN-2213 Query timeout support
ISPN-2213 Query timeout support - added test
ISPN-2213 Query timeout support - setting a timeout on clustered queries should throw exception for now
Upgrade to JGroups 3.2.0.Alpha1
ISPN-2231 - SyncReplTest#testMixingSyncAndAsyncOnSameTransport() looks to be broken
- the test was incomplete as it didn't run verification phase in order to make sure that the RPC methods were invoked with appropriate params
ISPN-2232 Make sure local query caches can also be registered

* This can be achieved making sure the correct type is given when the
query interceptor is retrieved from the component registry.
* This avoids the need for unnecessary query interceptor registration
because the custom interceptor chain handling already takes care of
that.
Disabled because of intermittent failures: https://issues.jboss.org/browse/ISPN-2248
ISPN-1424 First implementation of the new CH algorithm

TODO Check that the ownership differences added when the list of members changes are minimal.
TODO Optimization. The current implementation can take 30ms with numSegments = 1000, numOwners = 10, and 10 additions + 10 removals.
TODO API change - separate leaver processing, actual state transfer, and cleanup after state transfer in 3 interface methods.
ISPN-1424 Changed the API, split the CH update in two

First phase is the members list update - without new owners.
Second phase assigns new owners (with a flag controlling
whether to keep the old owners).
ISPN-1424 New CH interfaces/classes renamed.
ISPN-1424 Shorter names for some of the CH interface methods and some minor refactoring

Made ConsistentHashFactory generic.
ISPN-1424 Add Externalizer for new consistent hash classes
ISPN-1424 New interfaces for the global components that take execute the rebalance op.
ISPN-1424 First implementation of the topology managers
ISPN-1424 Starting to remove CacheViewsManagerImpl
ISPN-1424 Better logging for component registry startup errors.

GlobalConfiguration was being removed from the registry
after a failure, and rewiring the non-volatile components failed after that.
ISPN-1424 Use the new ConsistentHash interface in DistributionManager and everywhere else.
ISPN-1424 Introduce an AdvancedConsistentHash wrapper with grouping.
ISPN-1424 Introduce a new consistent hash implementation for replicated mode

All the members are owners, and the first member in the list is the primary.
The node selected to push data is the last in the list of owners - i.e. the last node to join.
ISPN-1424 Removed unneeded serialVersionUID and transient modifier from fields

The GlobalTransaction class is no longer Serializable (it is Externalizable though).
ISPN-1902 Fix xsd and add test
added gitignore; switched to timeit
fixed bug in passing data for reference boxes
starting new geom
created binned timeline data
got ajax to work (BOOM) for pins
Added back in click on task content to edit
removed unnecessary files

no more includes
Fix error on Save btn in StandBy view
Add RELEASE-NOTES for g25605

Change-Id: Ibd09a52e98ea2e8fcdf0291b4a586870cb128007
Bring in 1.19 history, update 1.17 and 1.18 history too

Change-Id: I098fdb5610011cbdd91012b8ed4d29e61ca80408
Merge "Bring in 1.19 history, update 1.17 and 1.18 history too"
Updates for MW 1.21

Change-Id: I582c1bcc50d694705b560fea893d0b2984072c08
add news part 1
finish adding the news item
add book title to book details page
Remove nerd tree settings.
Merge branch 'master' of github.com:ghickman/vim-files
Don't cache ctrlp
Site updated at 2012-07-23 02:52:53 UTC
Add parse_priority_expr function.

Add enum prio_types to enum all priority numbers that are used to make
previous function be equivalent to 10 functions with duplicate code with
names similar to enum prio_types names (example: LOGICAL_OR_PRIO make
parse_priority_expr((int)LOGICAL_OR_PRIO)  be equivalent to logical_or()
function).
Delete all equivalent functions.
Add function is_valid_operation wich includes all "if" statements in
deleted functions.
added solution file that ties all of this together
discard ungrown frags
adding current list to the main page
more and more sass
0.25.1
Respond JS to DELETE /conversations/.* Fixes #243 in a kludy way.
Better fix for #243. Thanks @kpitn.
add mysql_tools addon as submodul ..
using warfin instead of cube
Removidas bibliotecas JS innecesarias
Merge branch 'master' of https://github.com/gomezhyuuga/SiRASS
Updated HTML templates for RDFaLicenseGenerator for new website.  HTML
updates courtesy of Martin Michlmayr
17 failures
added xfce wallpaper code
* avoid uncessary zero extensions in case code


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21979 3ad0048d-3df7-0310-abae-a5850022a9f2
* Customization of upload dir

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21769 3ad0048d-3df7-0310-abae-a5850022a9f2
* Support for Is Nested procedure declarations (Bug ID 21992)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21851 3ad0048d-3df7-0310-abae-a5850022a9f2
* Patch from Lacak2 for Mantis #20379 FirstLineAsSchema improvements.


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20611 3ad0048d-3df7-0310-abae-a5850022a9f2
 * Replaced fpcmake building by fpmake building

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20612 3ad0048d-3df7-0310-abae-a5850022a9f2
* mark units as used in case only static symbols from inside object,
    record or enum symtables are used (such as class helper methods)
    (mantis #21808)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21512 3ad0048d-3df7-0310-abae-a5850022a9f2
use the new plugin repo exclusively for 2.1
"integrate-with --git" improvement

Makes "integrate-with --git" more usable for STS users
	-> ignoring Linked Folder ".link_to_grails_plugins"
Merge pull request #204 from delight/integrate-with--git-improvement

Integrate with  git improvement
Add faster key repeat
Updated gitignore
Updated bash_profile
clarified that you must be using HTTPS to host the files.
Added support for registering user. Only template code for now.
* add nova_billing support for glance
HBASE-7042 Master Coprocessor Endpoint (Francis)



git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1409431 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7165 TestSplitLogManager.testUnassignedTimeout is flaky

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1409650 13f79535-47bb-0310-9956-ffa450edef68
Added the gsb_feature_person feature.
setup.sh was stupid
Update ignored folders/files
Configure getmail4 for backing up EnterpriseDB account.
social plugins : facebook like/comment
corrección conf
divides the classes with more granularity and adds first and last classes
Fixed blur event for textaea containing html (ex: markdown/textile)
changed title of last heading
simplified open notes list
Bump down version to 0.2.0.pre
Move camelize helper to Utils
Add a simpler MWS example
Bring back syntactic sugar
Add logging to detect unexpected errors in search update service.
add trifusion and trirapide
Initial commit
update travis to install via composer
Removed option -m in defun twh-test-current
Changed key binding for twh-mobile-coffeelint to C-c M-l
Support for TWHPhonegap
1. Menu
2. Reserve Book
3. View all books
4. Check Library Number
Update version and use standard packages.

Finally qtwayland is compatible with Wayland 1.0 and libxkbcommon 0.2.
Remove patch.
Update list of things to do.
Add weston from AUR.
Add cairo-gl from AUR.
Fix dependencies to make it build.
Add qt5-qtwebkit-git.
qt5-qtwayland-git just reuploaded to AUR.
Rebuild packages.
Moving hg to hgext, and modifying hgrc
Fix jdk version
Fix glitches with the new license config dir code
Add documentation for github
Merge branch 'master' of github.com:headsupdev/license
Fix bug in tests that do not have usageOptions
Do some important refactoring of scapy related functionality
* Move functions for detecting the default network interface into txscapy
* Make sr1 follow the syntax of scapy
* Add notes as to why the parasitic traceroute test does not work
modified gitignore for komodo files
added theming modules and themes
trying to get the menu on frontpage
removed unecessary file
use_ldap
Merge pull request #16 from hgimenez/master

Fix addon option params
Fail gracefully on non-HTTP-status errors
Merge pull request #18 from dim/master

Catching Excon::Errors::Errors fails with timeout in Heroku::API#request
v0.2.5
fix scale to properly update ps list
v0.2.6
Doc patch

Fixed the `#delete_addon` call, and gave all method invokations an
implicit receiver for consistency.
ignore
Merge remote-tracking branch 'origin/master'
nuttin
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/functions.js
systemet sender ut dynamiske suksessmeldinger
Update Project Euler/Problem3/README
Fixed a bunch of issues to accomodate subprocess
- convert command to utf8
- use strip() rather than slicing
- use full path to voms-proxy-info
- fixed return value of condorExe.iexe_cmd()
- pass environment to subprocess correctly rather than multi command line
3717 översättnignar, mer än hälften!!!
added new style with new bg and shadow
Merge remote-tracking branch 'origin/dev' into dev
命名统一，方法补全
Adjusted README files to reflect addition of JSON option.
[Issue(s) #25]
Messing with background images
9.10 night
1. RecordView
9.14 night
1. RecordView, RecordController
9.19 monring
1. project
9.19 monring
1. project
9.19 monring
1. project
9.19 monring
1. project
9.19 monring
1. project
9.19 monring
1. project
整理了 Models, Views, Controllers, 可以运行
Ember.js and Ember-data.js 升级, Models 大改动!!
Bugs : 
there is a bug in ember-data: when ManyArray has no record to load, it will not trigger didLoad nor change the isLoaded property to true. 
Fixes : 
In RecordArray xDidLoaded function, check if loadingRecordsCount === 0
11.14
enpenseCategorySuccess
Merge branch 'master5' of https://github.com/hoyoji/HoYoJiMoney.git into master5
9.19    major revision  incomecategory 16.27
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
9.20  major revision  incomecategory 9.45
9.20  major revision  incomecategory 13.14
9.20  major revision  incomecategory 13.14
9.24 edit income  and temalate 11.04
9.24 edit income  and temalate 11.04
9.24 combine JQ 11.04
11.13
review currency and currencyExchange models 
Merge branch 'master5' of https://github.com/hoyoji/HoYoJiMoney.git into master5
Add neosnippet key mappings
neosnippet <TAB> key mapping
modify newfile8
[seo] doc title on level page and category page
ActivitiController

ActivitiController- Manages activiti engine
Also adds activiti JARS
git: changes alias 'st' to 'status -sb'.
split-window
Merge branch 'temp1'
persist: 4h
Update mowlib/mow_utils.py

Removed unneeded imports
Strip HTTPS port
Filter port based on scheme as suggested by dgouldin
Merge pull request #6 from ib-lundgren/filter_https

Strip default ports by scheme from within normalize_base_string_uri.
clarify setup.py
added Protocols
Making numbers really numbers, not just strings
Replace run_tests.sh with phpunit.xml.dist
sort needs an array..
Prevent bug when initializing window without url and disable autosave
Moved readme.md to root, added assembly license, ignored dlls, and updated assembly metdata
fixed links in english table of contents
fixed links in english table of contents
Merge branch 'master' of github.com:imeos/metanetpaper
[feature/revisions] Reimplemented feature comparison stats

PHPBB3-10755
[feature/revisions] Changes to diff and single revision handling
Outputs to deploy dir.
Actually use fixed message
Add quit message
updated bundle
removed hygiene test
travis config
Build 0.9.0 - Stop RTT - #129 - change copy on phone app screen
History rewrite after Git failure: XML reader refactor.

1) Node visitors are classes now.
2) Document visitation context doesn't inherit from attribute manager
anymore.
3) Node visitor map is external to the parser implementation and
can be changed.

TODO: Move hierarchy writing out of the reader core.
Changes to build system.

1) CMake include files unified in the repository root
2) Separated header and source in XML definitions (Common/ subfolder).
updated files to add relevant icons
added amadeus boxgripper description for raw3-1
fix raw urdf
Changed cucumber scenarios to scenario outlines to shorten code.
comment .emacs
regualarWorkflow
Merge branch 'tests' of github.com:itsatony/bubPubSub into test
merge + change in checkIfHoleWorkflowIsWorking
added a list of player emails in the admin module
merging SaveMatchResult with CreateMatch (in prgress)
merged createMatch and saveMatchResult into one action
merged master
MacOS module cleanups

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
MacOS: avoid checking clt_version in clt_installed?

Checking "not clt_version.empty?" is unnecessary if we are also checking
that dev_tools_path is /usr/bin.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Split Xcode and CLT methods into separate modules

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Move Xcode and CLT modules to a new file

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add MacOS::Xcode.provides_autotools?

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Use new Xcode module

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add MacOS::Xcode.provides_gcc?

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Rename xctools_fucked?

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
fixin up gitignore
Added tests for builtins, fixed things
erase old files test
Inserted a blank
Merge branch 'jameskbranch'
Now handling tab delimited file better
finished different player types. Need to finish EOG checking in Controller only. Remove it from Board and player
autocomplete and ehcache
fix
updated gitignore
Added searchable bookmarks
Updated searchable bookmarks.

    - Added documentation.
    - Fixed argument parsing.
Removed -p from elvi/duckduckgo.

    - Prevents clobbering -p[rint].
    - Also fixed ChangeLog dates from previous commit.
Simplified searchable_bookmarks
Further simplified searchable bookmarks
Added an example integrating sr and elinks
Updated ChangeLog
Actually add examples/hooks.lua
add keybinding to quickly reload a file
script for writing a csv file of the scaffold assignments
add in SQL_RESET_SEQUENCES option
Merge pull request #20 from andymckay/master

skip resets
Fix bad links on disqus and tag cloud
Add vim-pad
Add smyck colorscheme
FIXED: Problem with loop_check not finding all loop cases.
Update leetcode/C++/restoreIPAddress.cpp
vs2010 project updated to include all new sources
Added instructions on how to use the process python script.
alias for interactive add
autosource vimrc
overwrite if symlink exists, create bak file
Old ds aliases and variables for zsh
preprocess html
:xMerge branch 'master' of github.com:jeissonp/pruebas01
optimized up_image to have less lines written on converted file
better usage of class (step 2), remove reference to tk>sg conversion
added update speed control
Add :unlogged option to create_table for PostgreSQL
Make uniqueness validations correctly handle nil values

Previously, the uniqueness validations did not work correctly for
nil values, since they checked if there were other rows where
(column IS NULL).  However, in SQL, NULL = NULL is not true, and
multiple rows are allowed to have NULL values in a column with a
unique constraint.  So skip the uniqueness check if the value is
nil.

If you have a UNIQUE NOT NULL column, you should have a separate
presence check to check for the nil values.
Fix modifications of primary key column in more cases on MySQL
Don't have a separate method of UNLOGGED

Database specific SQL doesn't need separate methods, it can access
the constants directly.

While here, reformat the if statement to use standard Sequel
format, and move the raise inside the if so options[:temp] isn't
checked twice.
Stage One Deploy
Updates
Removed remember me from form
just for export_symbol
Old QR scanner remnant removed (ScannerKit)
deleted odd redundant .gitignore file
added NOTRACK tag
Enable PERL5_CPANPLUS_HOME environment variable for changing .cpanplus location
Bootstrapified desktop and added window view
Update
Merge branch 'SKBRANCH' of github.com:jing200588/T2G4_EM into SKBRANCH
Latest changes to .jade files and styl
Added notes wrt Problem Detection
fixes #5

- raise error if the path to pdftk executable is invalid
version 0.4.5
se modifico la  las clasese para editar un bussinesEntityType
allow minimal option
Auto-update: 19-Apr-2012 11:45:01
Simplifying the jobnames for the drmaa jobrunner
Removed useless asserts, changed some function parameters related to CStrings
New Branch for our completed perl wwxtp server
DONNNNNNNNEEEEEEEEE!!!!!!!!!!!!!!!!! :D
Merge branch 'wwxtp-in-perl'
Implemented importJson. And a bunch of minor improvements.
Don't make so much.
AbsoluteLayout bug fix

Error in contentSize calculation logic resulted in contentSize not
taking into account multiple children.
Merge pull request #7 from robsilv/master

AbsoluteLayout bug fix
Moving test code to test file
Declaring var for local variable
Preventing global scope
Merge pull request #1 from philss/master

Removing test code from lib
connecting to port 24
Updated to a multi-module maven project instead of an inheritance based project. Also move more project definition items to GitHub instead of BitBucket.
More parser definition which will allow for successful compiles.
Fix: Don't allow purchase of new machines if you don't have the cash for it. Fixes issue 1177.
Change: The custom game button doesn't work when using the demo files (we're now using more sprites), show a message about this. I know it's a little late to introduce another string, but I seldom try the game using demo files...
Fixed a mistake in the translation list for the Windows Installer.
The Windows Installer now properly wipes the Lua folder before installing over an existing installation.
Updated Swedish translation.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@1551 c39591fa-788f-11de-a72b-d90af8dea425
block analysis for ti
updated version of all files
edit controller, model et view vehicule
cambio en el generador de unidades de medida
Add correct CPAN-Config.pm path for RHEL 6. Fixes COOK-1129.
More work on the theme markup

Markup
Addition of functions.php and the menu include.
Added new hashing functions and updated random string generator to only use lowercase letters.
Mundando a primeira linha do body para Curso de Git
Changed to code.
webstatic: fix title
v1.120901

 - webstatic: fix webpage title
Build results of 5b5f87e (on master)
Missed off a brakce, doh
Doesn't included .his or .dat
Add File::NULL
Moved phpunit.xml to root. Added MongoDB\ODM to required packages.
Update pkg/bbui-0.9.4.js

Fixed readonly/disabled items so that the x does not appear, and you cannot delete the contents.
TinyI18n: Moved to a gem (TinyI18n).
fix file new line cr -> lf, rename envisalinkcodes.py -> envisalinkdefs.py, overhaul envisalinkdefs.py to use new method for tracking status, write generic event handler allowing for it to be overridden, add default state for zones/partitions/system
Steps and Speed controlled now
Remove global wildignore mod
removed TODO for previous commit
removed obsolete code due to refactoring
WIP - refactor exception transformation into private method
Improve load times. CSS should always load before JS as JS tags cause the browser to block.
Merge pull request #2 from NickStallman/master

Better load times
Replace build script with Makefile
Minor memory-logic error.  textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it.  Also, an init method called release outside the proper scope (the do{}while(0); block).

If you don't like the autorelease pool, it's easy enough to change this fix.

Aside: someone pulled tools/cxx-generator again, not me(!) :-)
Spidermonkey headers are not used for generation
gendbings.sh generates userconf.ini

 * ... and reads userconf.ini from current working directory
 * ... also specify that this script is run by /bin/bash
Jenkins script to generate JS bindings
Merge pull request #1378 from folecr/jsbindingsscript

JS Bindings generator script for Jenkins
fix compile errors of TestJavaScript
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
[Lua] add CCApplication:getTargetPaltform()
issue #1483: Synchronizing CCControlExtension to latest version.
issue #1483: Removed a comment.
add fps_image.png into TestCpp
issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.
Merge pull request #1381 from dumganhar/iss1483_sync_cccontrol

issue #1483: Synchronizing CCControlExtension to latest version.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into layer_gradient
add new GUI component
Merge pull request #1382 from minggo/layer_gradient

fix some compiling errors when testing
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
Merge pull request #1383 from dumganhar/gles20

Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
Added library dependence for create-android-project script.
Merge pull request #286 from kabel/develop

Add missing break statement when setting compiler
add web viewing of session history in the form of a static HTML site and CSV files
remove data/*.json files
Bugfixes to notifications & trip precision mileage
Removed template parsing
Encased it all with the module pattern
Added the library and test.
MDL-31856, if choice not open, responses inconsistently displayed
modify setting of relative number
new "upstream" versions
added &KSM::Helper::strip that strips leading and trailing whitespace from strings
updated MANIFEST
Two changes: logging can be done to files, Gauges added
Added a class for the cell edges. I have runVoronoi() adding these edge objects to a list and then finding all other connected edges. This is pretty slow right now, but is a step towards finding the individual cells.
Rename the fields of the Client type.

Now 'options' is 'clientOptions' and 'endpoint' is 'clientEndpoint'.
This is intended to allow 'endpoint' to be a function for creating
endpoints, and to avoid having to import Endpoint qualified in the
Client module. It also makes the style of Client field names similar
to that of other records.
Rename Endpoint.mkEndpoint to 'endpoint'.
Rename Endpoint.windowUpdate' to 'sendWindowUpdate'.
arm: tegra: stingray: enable ZRAM

I'm going to use this for swap (and maybe IPC for sqlite3)

Change-Id: I8554cc49d00d723000d45cb78a3023cb832291b2
[ARM] tegra: spdif/i2s audio: increase number and size of audio bufs

No wonder the audio stutters so much under disk load- there's only
two lousy 4K-sized audio output buffers. Raise the number of output
bufs to 12 and input to 4, and make them 16K.

Change-Id: I7d77ac3b7b4a4e94b504ba840c13ab9efbc8897b
Merge remote-tracking branch 'eos/jellybean' into jb-2.6.39

* eos/jellybean:
  [ARM] tegra: spdif/i2s audio: increase number and size of audio bufs
  arm: tegra: stingray: enable ZRAM
mm: remove Stingray defaults

Will put these into the defconfig file where they really belong

Change-Id: I793fe5200c252d55a0de3d4a3aa018312deaefa3
block: SIO I/O Scheduler

From https://github.com/waninkoko/sio-iosched.git ; doesn't seem to
have much in the way of changes nor activity in the last few months
but is apparently considered latest and most-stable version

Change-Id: Ic062f67379eed202bf5ba50e121619ae3225981a
arm: tegra: stingray: make SIO I/O Scheduler the default

Change-Id: I7fa70309579f495acb09782b0bb5475a38891c8a
Merge branch 'sio-and-vm' into jb-2.6.39

* sio-and-vm:
  arm: tegra: stingray: make SIO I/O Scheduler the default
  block: SIO I/O Scheduler
  mm: remove Stingray defaults
Added figure rendering and a guide figure for positioning objects.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
Some minor changes.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
will make ability to glob all replicates
added optparse to clean up params
clean up and renaming
install Gauche on install:
modification of tests messages
removing fastexp usage
showed the expected output for B
diff output in application_helper.rb
Update lib/motion/spec.rb

Don't undef _? from coalesce gem in spec mode.
added settings support to layout-liquid
KeyValueStore追加
更新
Importers finished
Revert "Add sample code"

This reverts commit 8bf606ad54853c4ef52b3df1df17a46b51cb71e6.
Add space back
Sent lost th tag to its home.
Update .osx

Commented out unnecessary settings.
dont create block undo too often (wait one second)
Possible (and quite likely) fix for a problem where radium freezes if playing a few hours after starting the program.
Increase block undo timeout to 3 seconds
dynamic load, first try // tests do not pass yet
Display photo "Leaving Yerevan... [Explored]" from "85mm.ch"
Updated template 3 download
added current slide hide to minified version
Updated installation instructions.

Not dependency on the development version of lme4 anymore.
But the package now depends on version 0.9-5 of robustbase.
twitter bootsrap
conf
[1.5.x] Fixed #19058 -- Fixed Oracle GIS crash

The problem is the same as in #10888 which was reintroduced when
bulk_insert was added. Thanks to Jani Tiainen for report, patch and
also testing the final patch on Oracle GIS.

Backpatch of 92d7f541da8b59520c833b19fbba52d3ecef2428
[1.5.x] Fixed #18347 -- Removed autofield raw SQL inserts from tests

Backpatch of 71e14cf3aa024496adcb23e83ddf13a7c5ddeb32
[1.5.x] Fixed #19296 -- Applied test connection sharing for spatialite

Thanks pegler at gmail.com for the report and the initial patch.
Backport of ff0d3126af from master.
[1.5.X] Fixed docs noting comment_will_be_sent returns a 400, not a 403

Backport of d8ee46afff from master
[1.5.x] Fixed #18985 -- made DeprecationWarnings loud

Capture warnings in Python >= 2.7 and route through
console handler, which is subject to DEBUG==True

Thanks to dstufft for the idea, and claudep for initial patch
[1.5.X] Documented that contrib.sites creates a default site.

Thanks Lorin Hochstein for the patch.

Backport of ac4aa8a76c from master
[1.5.x] Fixed #19136 -- Properly escape gettext context prefixes in the i18n JavaScript view template.

Backport of 4a5e8087ac7676ef08e76275c1f756778b39c13e from master.
[1.5.x] Fixed #18210 -- Escaped special characters in reverse prefixes.

Ensured that special characters passed in to reverse via the
prefix argument are properly escaped so that calls to
django.utils.regex_helpers.normalize and/or string formatting
operations don't result in exceptions.

Thanks to toofishes for the error report.

Backport of 90e530978d590a5bdcf75525aa03f844766018b8 from master.
[1.5.x] Fixed typo introduced in 0e3f7814d7106768e8eafcba0e74238fcdb90f9d.
[1.5.x] Fixed #19310 -- changed method docs formatting for custom file storage docs
[1.5.x] Fixed #18989 -- Removed unused condition in CursorWrapper

Thanks zimnyx for the report.
Backport of 8c6927876 from master.
[1.5.x] Fixed #19226 -- Applied linebreaksbr to read-only fields in admin

Thanks shadow for the report, and Melevir and thiderman for the
patch.
Backport of ec9d6b112 from master.
[1.5.x] Fixed #19036 -- Fixed base64 uploads decoding

Thanks anthony at adsorbtion.org for the report, and johannesl for
bringing the patch up-to-date.
Backport of 2a67374b5 from master.
[1.5.x] Fixed #19114 -- Fixed LogEntry unicode representation

Thanks niko at neagee.net for the report and Emil Stenstrom for
the patch.
Backport of e0363c688 from master.
[1.5.X] Fixed #16779 - Added a contributing tutorial

Thank-you Taavi Taijala for the draft patch!

Backport of 7058b595b6 from master
[1.5.x] Add `form` to formwizard context (includes tests)

Backport of ba81164fb771391b92575b5aaab6e286f56eb831 from master.
[1.5.x] Add 'page_kwarg' attribute to `MultipleObjectMixin`, removing hardcoded 'page'.
(cherry picked from commit 502be865c68635d5c31fa3fa58162b48412153ad)
[1.5.x] Test for `ListView.page_kwarg`
(cherry picked from commit f824a951776db86c04aaefc1e7c1c12ffb84c798)
[1.5.x] Include `versionadded 1.5` directive
(cherry picked from commit 5bc6929f9af4d71065bce42578e49354096a7bf4)
[1.5.x] Formatting tweaks.
(cherry picked from commit 3f2fc2f41abf226913517eb1e655f823f2c5e53a)
Be compatible with parent getIterator.
Add comment.
Added sidekiq gem
Merge branch 'master' into pp/sidekiq

Conflicts:
	Gemfile.lock
Changes in parser spec
Removes slim/Slim Files
Added support for re-defining a default currency.
custom portlet changes
Update Buru
okay four down, six to go
okay templates done
send_to() returns result
move box position.
Merge pull request #2 from esoz/master

edit map.svg
added column left and news partial for header and nav left.
modified show for categories
added gem will paginate and renders
added plugin ransack and search form
Added gem carrierwave and active admin.
fixed view of products and categories
modified gitignore -> +Backoffice_Test/obj
Bug fixes and initial support for unary functions.
#15 set up translations
nodes now get an identifier
new console command, resources
chat text now wraps. Added color for spectators.
Merge branch 'master' of github.com:larrySGI/SGICollab
set class to "collapse-sidebar" when site.sidebar=="collapse"
style customization
style customization
style customization
style customization
style customization
style customization
write a new post
Merge branch 'source'
Changed 'peptide' to 'clone'
Merge branch 'master' of github.com:laserson/phip-stat
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15304 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15305 4d416f70-5f16-0410-b530-b9f4589650da
Update to druntime (ldc.memory).
Add info about registered targets (mimic LLVM tools).
Merge branch 'master' into llvm-3.1
Remove unused inifile implementation.

LDC uses libconfig. The inifile implementation is dead code.
Add support for MS Link.

If the target OS is Windows using the MS runtime then use LINK.EXE as the linker.
Trying to get cropper to work
Images
Updating user model
Style updates for profile page
Merge branch 'profile-design'
Profile design
New header background image
- removed log
- gitignore
disabled locale settings
Merge remote branch 'origin/master'

Conflicts:
	zshrc
git log aliases
ヘッダが足りないのを追加した
NACL化
Google Native Clientに移植
add resharper to git ignore
Updated 'news' to 'blog'
Updating JUST sitemap