labofsahil/github-event-dataset-2012 huggingface dataset:
Do not overwrite rc.conf by zfsinstall

Suggested by:	Michael Ranner <michael@ranner.eu>
Nieuwe progs
TOC styles
-Removed old date parsing from manual upload.
-Changed date parsing to use moment.js, which supports milliseconds in date strings and will birdge the gap between differing browser support.
Merge branch 'master' of github.com:isenseDev/iSENSE into mm535

Conflicts:
	web/html/coffee/highmodifiers.coffee
	web/html/js/highmodifiers.js
Merge pull request #547 from mmcguinn/mm535

Date parsing update
-Added saved zoom capibility.
Merge pull request #548 from mmcguinn/mm493

-Added saved zoom capibility.
Merge pull request #37 from mobify/content-updates

Content updates
add portions previously truncated from the Handling Javascript document
Change from @mobify to @mobifyjs
Merge pull request #38 from mobify/fix-handling-js-doc

add portions previously truncated from the Handling Javascript document
escape percent signs in talk about the script pragma
one last nagging {% to convert
Merge pull request #39 from mobify/fix-handling-js-doc

escape percent signs in talk about the script pragma
Docs: Rewrite the introduction to understanding templates.
Merge pull request #40 from mobify/update-understanding-templates

Docs: Rewrite the introduction to understanding templates.
Update www/docs/getting-started.md
Merge branch 'master' into content-updates

Conflicts:
	www/_layouts/base.html
partial support for multiple instances added on the client side (first step towards cascading selects)  #9
Client support for XPath expressions that contain paths to both secondary instances as well as (absolute) paths to the primary instance (itemsets)
added multiple instance support on server side (step towards itemset support)
upload fixes in form test component and client support for multiple instances added to this component
fix for file uploads
edit
added a unit test for xslt transformation
relocated test forms
updated transformation error check
itemset support added and a big re-write of messy parts
a start with cascading selections JS logic
added test form for cascading selection
cascading selects functional when itext string are used for labels
small updates to test component, and renamed this to formtester
fix for default values
new name of component
tests for itemsets, added method for generating form mock strings from xml
cosmetic improvements
fixes for itemset support
clean up
getting totally crazy now and setting timeout to a minute
Add new elisp function `etsy-convert-method-parameters'
Fix for performance in Objectid.js
Allow store_in values to be procs:

Example:

  class Band
    include Mongoid::Document
    store_in database: ->{ Thread.current[:database] }
  end

[ fix #2613 ]
Upgrade to Rails 4.0.0.beta:

This upgrades to Rails 4 at master and removes all the previous mass
assignment security code, updating to use ActiveModel's
ForbiddenAttributesProtection module.
Bump version
Remove Mongoid::Paranoia. [ close #2433 ]
Remove Mongoid::Versioning. [ close #2432 ]
Cleanup model tracking for index creation/deletion.
Remove multi parameter attributes
Fix the observers being removed from rails core
Cleanup more observer code. [ close #2597 ]
Start of 3.0.4
Reformat session
Reformat cluster
Reformat connection
Reformat criteria
Reformat node
Update node scaladoc
+ random vector generation
+ vector component extraction
modified project into api
increased MAX2837 RX output common-mode voltage to maximum
BalajiN | #0 | Fixing the __history__ redirect problem in the smilie widget
Remove useless placeholder tests
Fix the testsuite so that it's possible to run tests.
Update playdoh-lib to add a new testrunner
update l10n tests to use the "was" block instead of "else"
Jenkins shell script to run tests
Update Django to 1.3.1
add Vary header for DNT
Merge branch 'master', remote branch 'origin/master' into dev
Merge remote branch 'sgarrity-fork/bug-756356-dnt2' into dev
[Bug 782854] Fix upvotes default value warning.

Modifies the column to use NULL as the default value.
multiselect working for suites and runs again. added location to page title.
Hackish fix for getting method closures on super
Fix hackish callsuper fix
runtime: Don't memoize on native prototypes.
compiler: Fixes namespace lookup order in inline caches.
compiler: Optimizes stack flush operations.
runtime: Adds flag to only compile a certain number of functions.

This is useful for finding compiler bugs.
inspector: Made it pretty.
runtime: Implemented vector |pop|.
test: Added more passing test cases and made the test harness calculate a passing percentage.
Added option to only disassemble multinames, this is useful for post processing / analyzing what library features an .abc file uses.
Fixed isType bug.
No longer boxing VM errors, avm2 errors can be caught by user code.
(no bug) exit if any table fails to import
(no bug) build_date column removed
(no bug) bump schema version, move backfill and product_versions setting to import.sh
Merge pull request #499 from rhelmer/fix-import

(no bug) fix import process for Socorro 5
Add certificate generation script.
don't collide me bro
better collider fix
Merge branch 'supercollider'
remove more mutable args
allow the install of packaged apps (bug 777144)
right level for verify
work around bleach
missing daily stats listed as 0 in graph/JSON (bug 758480)
Prefer Sidekiq.logger, inject message context into all working logging
Merge branch 'master' of github.com:mperham/sidekiq
deleted stuff 2nd ternary commit
Getting closer on streams, working on problems of multiple streams mixing incorrectly.
Filled Item-Element Matrix for FORE
Compilation optimisation

Do not compile the code related to the webserver in http_SendMessage
when --disable-webserver is set
travis: support deb
add some personal files
Add some stuff
Remove guru-mode, add menu-bar
Minor fix, testing
add syntastic configuration to vimrc
conditionally load simplenoterc
Deleted plugin feedback function
Switched to colorbox, Added the override folder
[sim] [engine] Add simple synthetic task spawn simulation mode (for testing Dimitar's DTG visualization).
nitrux-icon-theme 1.7c is out
Updated for trendlines
Arduino sketch
Merge branch 'master' of https://github.com/mwalls67/Benson
static-page test
the README file actually contains the LICENSE, rename it appropriately
the Android server/ is now the Agent, and will be maintained in a separate Github project for clarity (github.com/mwrlabs/mercury-agent)
the CHANGELOG is now maintained in a separate, meta repository
moving the client up to the root level of the mercury repository
bringing the Eclipse pydevproject headers out of the old client/ folder
adding the mercury-common repository as a submodule, so we can import the Protocol Buffer definition
importing the source for Mercury v2, and moving the source into a src/ directory to keep the root namespace clean
adding a series of unit tests, to exercise parts of Mercury
updating the .gitignore file with a lot more paths that we may come across, and wish to exclude from scm
adding a Mercury script, which is the main entry point to the app
swapping the README for a Markdown version, and adding a section on INSTALLING
removing the Eclipse project, because it doesn't work
correcting the description of the 'tools.file.download', which said upload by mistake
removing the old entry point (mercury.py) because we do not require it anymore
creating a new Eclipse project for the console
modify the ByteStreamReader to return a byte arary, rather than a string
add a ReflectedBinary type, to mirror that on the Java-side and handle the DATA type
when reading an apk file to send to the device, do not stop reading until no more data is available; otherwise we can ship part of an apk
Merge branch 'develop' into experimental-bytestring
provide a ByteStreamReader#read() implementation that accepts an offset and a count to support reading chunks from the stream
Add test for "--recursive"
added NominalisationSlash for English
added case to RP_NP and AP_NP.
still not perfect, because we don't have the guarantee that they take the NP's case, but then,
the NP case is a table type which means it cannot be "extracted"
and the NP is not being linearised in these constructions.
added NominalisationSlash for French
provided I understood the ton/comp distinction correctly
#215 added test for Entity annotated custom collections
#283 added groupBy, having and wrapping for unions
#145 added DslExpression as common base type for scalar and non-scalar expressions
2012-04-28-23.39.02: src/lib/src/lib/thread-kit/src/glue/redirect-syscalls-via-thread-scheduler.pkg:  Sketch in redirect calls for net_protocol_db.
play around with bukkit dev version for 1.3.1
added convenient methods to determine the winner of a cp
MDL-35462 - RTL alignment of several UI element when in "Scheme phase" Restore setting page
Стандарт транслита ГОСТ 7.79-2000
created the seed_file
Background-img login page
adding sonatype clojure repo
Merge branch 'favicon'
Added a freeze profile to use the ease plugin.
[maven-release-plugin] prepare release 34
[maven-release-plugin] prepare for next development iteration
Update distribution to reflect new server.
[maven-release-plugin] prepare release grandparent-35
[maven-release-plugin] prepare for next development iteration
Updated versions to get bugfixes in. Added lifecycle mapping for the licensing plugin.
Added the failsafe plugin.
Better surefire config as requested by @lassewesth.
Updated plugin versions. Added support for enabling different parts of the build using properties for phases.
Fixing README image link.
Still broken but far less broken :) Scored stuff nearly propagated.
Prepare support for CustomPkg (#492)
^ Changing location of icons
applying patch to disable sslv2

https://github.com/msabramo/M2Crypto/commit/b222073abc02eb937460d0cf0163d11d4fb369a7.diff
Do not track development.ini
track: Pass the element to transitions.py instead of just the ID
transitions: Allow using the "invert" property
Slightly improved EnemyMobAI

Also, fixed a bug that somehow allowed players to pass through enemy
mobs without killing/being killed by them.
Not much

just fiddled with a couple unimportant things.
The game is more or less playable. All the levels are identical though,
I should fix that.
Fix around numeric type for AVG
Improved error messages for failures during common lifecycle transitions
Build maintenence:

- track latest parent-central
- new site distribution info
- deleting old build tools
Moved AUTHORS to AUTHORS.rst, and updated setup.py to use my new format
check in GoogleBooksSearch demo
return 0 on file open failure
add Processor.java, Servlet.java, form.css
and update web page design.

Signed-off-by: nextspeed-pc <nextspeed01@gmail.com>
UPDATE lib/parser.js ~ tiny refector
ie double gradients
Added headers-map to send-request to allow for custom request headers
.gitignore file
update README
Fix up GetAlbumsNav() to use our new tables & flags
Fix up GetSongsNav() to use our new tables & flags
Merge 5.3.16 NEWS in.
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of git.php.net:/php-src
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
fix NEWS after releses
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of https://github.com/php/php-src
travis: own cucumber profile, ignores the @64bit features
rename UseFunction to CallFunction
refactoring Operand
Bug 4606. Include adult content reason on moderated entry.
Merge pull request #35 from ninetyd/bug4606/moderated_entry

Bug 4606. Include adult content reason on moderated entry.
merge
Merge branch 'master' of https://github.com/ninjury/Ninjury
We have added a and b
Add 2 lines
Changed B too
Added stuff that broke css
test cases xlsx
removing sytsem/trash/
Move plugins into own repository
ZOMGz factoidz
Add prefixes to factoid reggies
Merge pull request #3 from gf3/master

FACTOIDS
added ebook
Removed redundant member variables.
Merge pull request #3 from rolker/master

remove children masking mmsi, repeat, and id
prep for pypi
delete entry and add dish
Selector optimizer
news politieke barometer
Written test code for upgrade 11->12.
Completed checking feature.
Fixed a bug causing a crash caused by insufficient pointer initialization.
Updated TODO.
Merged feature_check branche back into master
Change mouseover to mouseenter and mouseleave
Add commands to repeatable.

 - scroll-other-window
 - scroll-other-window-down
Update key-bindings

 - (change) mark-text-object-word
 - (add) execute-extended-command
 - (delete) anything
Rename function.

 - mark-text-object-use-char -> mark-text-object-block-use-char
Replace definition position.

 - Key-binds are defined before plugins loading.
Add command for replacing buffers.

 - "C-q" is do it.
 - Existing command quoted-insert is "C-c q"
Optimize boot.

 - Delete discarded setting.
 - Stop server-start.
 - Stop setup-cygwin.
 - Replace 'require' to 'autoload" or delayed.
 - Add speed-meter (disabled).
Add timer for recentf-cleanup.
Set read-quoted-char-radix is 10.
ENH: various
Merge branch 'master' of github.com:npinto/mygentoo
Indes Galantes 1735 : prologue, scene 5 [3]
Indes Galantes 1735 : prologue, scene 5 [4]
Indes Galantes 1735 : prologue, scene 5 [5]

Contredanse
Indes Galantes 1735 : copyright
Indes Galantes 1735 : prologue, scene 5 [6]

Traversez les plus vastes mers, avec une seconde partie.
* Vim repo fix#
New command to be executed on C-g (will now remove all unwanted windows).
SPI nor drivers refactor

Moved common SPI flash driver code (device table,
common commands) into flash/nor/spi.c and spi.h.
Updated flash/nor/stmsmi.c to reflect this refactor.

Change-Id: I141644b0af71d3835f29f06dd15b505a00e5b6ec
Signed-off-by: George Harris <george@luminairecoffee.com>
Reviewed-on: http://openocd.zylin.com/782
Tested-by: jenkins
Reviewed-by: Aurelien Jacobs <aurel@gnuage.org>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Update notes for submitted changes

* ftdi: incorrectly using output register for direction
update mp4v2 to svn497, fix issue 142 of mp4v2
NXP-9852: Fix selected columns order on advanced search (tests)

Conflicts:

	nuxeo-platform-forms-layout-client/src/test/java/org/nuxeo/ecm/platform/layout/service/TestLayoutFunctions.java
NXP-9852: Fix selected columns order on advanced search
Fix ERROR in logs when selectdDocument is null
NXP-8974: Add dragndrop visuel element before making XHR request
NXP-9183: fix unwanted http log off during studio package hotdeploy
added menu option to admin to reload site
added github ribbon and link to github contributors on home page
Added security-integration-shiro, added missing services/ file to annotations module
Merged from upstream/master
Window class name + DotNetInfo
Custom tab control
Ajout du #page/size pour les datasets

Signed-off-by: Maxime Bury <maxime.bury@gmail.com>
+Ernst2012
mv photos and resources out
fix bug: judge deletion_bit condition logic error@search_dir
add project ex_01_esaansoft at esannsoftwarepark
fix path to node
Begynte aa jobbe med bytting av profilbilde. Fant en annen maate aa gjore dette paa
Backstage: management of events and list of reservations
introducing CURRENCY-setting, because it is missing in django.
Total fee of a reservation is now hidden
つかってないのけす
Windows: force vldb lookup if server list is empty

The Windows cache manager can mark server references as "deleted"
which can give the impression that a server reference list is not
empty when it is.  If the volume list is empty any attempt to
issue an RPC would fail with a CM_ERROR_ALLDOWN error.  Since the
VLDB data is current, this condition will remain for two hours.

This patchset adds a new error, CM_ERROR_EMPTY, which is returned
when the server reference list is empty.  cm_Analyze() is modified
to process the CM_ERROR_EMPTY error by attempting to update the
server reference list.  If the update succeeds and the list is no
longer empty, the RPC is retried.  Otherwise, the RPC fails as
before.

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

Change-Id: I954872a1db9467c441875609e75794c0bf0fcf07
Reviewed-on: http://gerrit.openafs.org/7690
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: AFSClose File FCB/CCB cleanup before DirCB

Move the processing of FCB and CCB cleanup ahead of the
DirectoryCB cleanup.  It is not safe to dereference the
Ccb->DirectoryCB until after the CCB has been destroyed.

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

Change-Id: I69ac0289ca559784c93828b1b8ef9e16e288c7b5
Reviewed-on: http://gerrit.openafs.org/8576
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: RefCounts, Asserts, and Trace Logging

Rename DirectoryCB.OpenReferenceCount to DirOpenReferenceCount
to distinguish it from the FCB.OpenReferenceCount.  This makes
it easier to search for instances within an editor or debugger.

Ensure that all InterlockedIncrement and InterlockedDecrement
calls on a reference count field assign their value to a local
'lCount' variable.  Ensure that 'lCount' is used within any
trace log messages and conditionals.

Add ASSERT( lCount >= 0) after all reference count decrements
in order to catch underflows.

Change conditionals from (RefCount == 0) to (RefCount <= 0) so
that object destruction can occur when there has been an underflow.
This is important in release builds for which ASSERT() is a no-op.

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

Change-Id: Ib83ec54316a2358fdc756c9f51b1ca4d82bf4db6
Reviewed-on: http://gerrit.openafs.org/8577
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Update sphinx docs for moderator changes.

For #212, #215, #204.
Added tab completion, check for curl and added otcheck to otreload.
fix broken block
Wrote initial version of data classes
moved deadlock handling to the method hasDeadlock in State
change alias extags
issue #164 , comments are now paginated via ajax
Merge branch 'comments' into future
itemActions improve some functions, Item Model deleteByPrimaryKey improved run_hook
Add partial support for fancy Unicode characters.

Support Unicode dashes, ellipses and quotation marks in text correction
patterns and "Toggle dialogue dashes" action. This support is only
partial, since only the most used characters have been added and because
in some places where replacements or additions are made, these
characters will still be ASCII regardless of what is otherwise used in
the same subtitle or the same document.
Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs.
Merge branch 'master' of github.com:owncloud/mirall
DerelictSDL2ttf now __gshared
initial stab at all visualizations for representative organism
adding description to article on detailed page
Bem burdamente funcionou
In l. 16 I changed gamma into tau; I also changed the numeric tag, but 315 is still WRONG: I was not able to put anything but a real number there, whereas I needed to make clear that the number is between 315 and 395. It was not possible to write 3?5 for the number. Please find better solution!


Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: rodney ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <pheilpor@ulb.ac.be>
Signed-off-by: Todd Hickey <tmhickey@berkeley.edu>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
adding JS correx
holding patter
Starting js' correx.
All correx added; Cisca's numeric range (now possible) also added.
lines 13+14 (Coptic) added

 - lines 13+14 (Coptic) added

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <pheilpor@ulb.ac.be>
Signed-off-by: Todd Hickey <tmhickey@berkeley.edu>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Entered text according to ed. pr.

 - Created from SoSOL template
 - Update translation with stub for @xml:lang='en'

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <pheilpor@ulb.ac.be>
Signed-off-by: Todd Hickey <tmhickey@berkeley.edu>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Rename Translation from 'papyri.info/hgvtrans/SoSOL;2011;0004' (HGV_trans_EpiDoc/papyri.info/hgvtrans/SoSOL/2011/0004.xml) to 'papyri.info/hgvtrans/118377' (HGV_trans_EpiDoc/118377.xml)
Update header to reflect new identifier 'papyri.info/hgvtrans/118377'
Updated the video link.
Added basic subscriptions
Merge branch 'master' into dev
Load roster before sending presence
Subscription management
Send presence after roster recieved
Handle presence after roster request
Simplified autocompleter
Fixed offline bug
Big files rename.
Api break, moving to QRunnanble/QtConcurrent for document parsing / building.
Real World Haskell examples.
Fixed removal of the user from the chat if he leaves only one room
Fix backticks code highlighting.
try a little harder to get a linked icon
get the small icon, rather than resizing the big one

The 16x16 icon is the first listed, so use that in preference to the (default)
largest one.
reversing horrible erase
Changeling added (and changes to Ability Categories consolidated).
Issue#: NEWSOURCE-146


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17121 b6a209e6-650d-0410-972b-dadffa731f64
Updated examples and added .CLEAR to AUTO:LANG tag docs
Issue#: DOCS-195


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17376 b6a209e6-650d-0410-972b-dadffa731f64
added new reversioning script for build process
Refactoring including a file renaming and formatting to make code close to
PEP8 compliant.
Check if DataSource is properly configured
Fixed: renamed $user to $account for coding standards.
update default count
Update the repsonse object.
Added some translations
Added contact tab
Styling some things
Add a restart action and make shutdown more cross platform.
macvim isnt that bad
removed tabman script
only changed a few keys
cleaned up some locations
forgot to enable applabel
Command prefix can be specified in the config
Gemfile so bundle install just works™
Add gems required by ldap and google plugin to Gemfile
Merge pull request #1 from blkperl/master

Add gems required by ldap and google plugin to Gemfile
Merge pull request #1 from nibalizer/master

Gemfile/prefix
added agent dom-event handling
Gemify
Building out some of the basic objects
Downloads: Added titles to icons. minor correction to the text.
	modified:   app/views/download/index.phtml
Merge pull request #7 from niden/master

Added titles in the download icons
cheat sheat page
Break tweets apart into name and text.
Flip between stacked panels when more than 6 plugins are loaded.
Fixes #10 - update Google weather every 60sec
Use window.setInterval instead of recursive setTimeout calls for flipping.
Initial work on defining plugin specific javascript functionality.
Merge branch 'break_apart_tweet'
Refactor CTA Train Tracker plugin and style it.
Add CSS colors for CTA Purple Line train
Refactor CTA bus plugin and style output.
Smiley jenkins pic
jenkins images fireworks file
Allow plugins to specify html class

If a plugin returns an attribute :html_class, the javascript will set
that class on the plugin's <div>, allowing for conditional styling of
the entire plugin dependent on state.

This lays down groundwork for #6
Style jenkins plugin based on success/failure

This should close #6
Use DUE instead of APPROACHING for CTA Bus plugin output.
Update JS/CSS to track master

New changes are to account for 5add0e4fb90db607ea23095704a6a77fe9e0fd72
Should close #6
Merge pull request #12 from phinze/happy-jenkins

Happy jenkins
TO DO:
- See dingo/dingo/TODO
implemented remove item buttons properly. yeaaahh.
fucking aye. userlists now in alphabetical order. Need to reduce the amount of spaghetti code
artf540617 : Update icon should not be available in all the projects that are not created via import applications
Merge branch 'durban' of https://github.com/phresco/phresco into durban
artf521372: Only one testsuite report is available in the pdf report even when there is a number of testsiutes.
Merge branch 'cairo' of https://github.com/phresco/phresco into cairo
Merge branch 'cairo' of https://github.com/phresco/phresco into cairo
artf522765:  unused files in ci adapt plugin
[artf521372] Only one testsuite report is available in the pdf report even when there is a number of testsiutes.
Merge branch 'cairo' of https://github.com/phresco/phresco into cairo

Conflicts:
	framework/phresco-framework-web/src/main/resources/reports/template/PhrescoSureFireCrispReport.jrxml
	framework/phresco-framework-web/src/test/java/com/photon/phresco/framework/actions/applications/PhrescoReportGenerationTest.java
Merge branch 'cairo' of https://github.com/phresco/phresco into cairo
site configuration and Android Profile handling
artf550271 : Wrong Copyright is followed in report
update plugin deploy directory modified in pom.xml
command line adapted instead of process builder in plugins
with sequel built-in pagination prototype only
adding pagination for index and searches
added pagination to lookup/searches too, not only index page, some minor tweaks
add .gitignore
re-arranged some stuff and broke some stuff, basically still working
fix paginate issue
Added animation showing pins dropping from above
standardized assignement of the tabbar

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1894 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Just windows being stupid about casing
add sample properties file
Minor grammar fixes to the README.
Merge pull request #39 from GregorR/grammar

Minor grammar fixes to the README.
Updated docs to 1.4.1
strong method added
Test script needs to actually write something before it can query. Added a 10 second pause to ensure the data hits the disk before the query tests start.
(strtoupper.c) add missing #include <assert.h>
add test for strtoupper/strntoupper
remove unneeded assert(3) call
fix assertions for strntolower
add strtolower/strntolower tests
Ken's conflict test

Edited the file Paul created
Add PodioReference
initial heroku test
this should be the full and complete content for figure 'meaningless join'
just a new comment-block. noting an interesting module-organization technique to maybe try later
forward progress with the meta-interpreter named mini_solve. now a bare call of 'member(X,[a,b,c]).' gets the same results as a wrapped call 'mini_solve(member(X,[a,b,c])).'
just some quick organization. more is surely needed...
updated my jobs create  pml
added my settings - default: dont show
Only show opportunites permitted when hiding
Merge branch 'feature/UMMELI-bursaries-internships' of github.com:praekelt/ummeli into feature/UMMELI-tom-tom-pilot
only show micro-task campaigns when we have data
Plugins installation
code changes

Added Following code
Heat Exchanger - cmbShellSide_Change
Heat Exchanger - cmbTubeSide_Change
Heat Exchanger - cmdTubeThickness_Change
Heat Exchanger - cmdTubeOD_Change
New code snippet.
added __call to HumusMvc\View\View
some updates to game model, javascript and front pages
move publish to web in setup to babushka
added monolithic classifer + fixes in decoder->classifier invocation
Add some location data getting
Редактирование категорий доходов-расходов

версия повышена до 0.0.0.6
Colors are optional
fixed proguard build
less debug info
Tweak tab style
Let the menu button open settings for now
Use wrap mode for text files
load git pack by default
rollback undo-tree from master to release/0.5.5 as there are currently some bugs
update live packs based on recent dev work. See previous commits for history
tentatively turn on auto-complete mode for the repo
add browse-kill-ring
update auto-complete conf to always display menu, even when only one candidate available
clean up auto-complete config
fix typo in browse-kill-ring config
Merge branch 'master' of https://github.com/overtone/emacs-live

Conflicts:
	init.el
Fix init.el.
Added documentation regarding ticked barlines to bar.py

Created trecento.notation.py for objects specifically pertaining to 14th century Italian notation. About half of what was medren.py is now located there. Also includes a subclass of TinyNotation to created streams composed of trecento.notation and medren objects. 

git-svn-id: http://music21.googlecode.com/svn/trunk@3225 5c16147e-a200-11de-b0cc-ab0ad15e60d0
remove all "import music21" statements from within the core files.  Fixed IDLE error.

git-svn-id: http://music21.googlecode.com/svn/trunk@3226 5c16147e-a200-11de-b0cc-ab0ad15e60d0
forgot to recompile grammar before testing and commiting changes
Shows the correct day of the week for schedule slots (it should have been using the DAY not the MONTH to do the look up!).
adding contact link to footers
Adding a venue page, now that we finally have one :D
No need for keep the same methods replicated on the Manager if we have it on the QuerySet
Renaming earnings as incomes
Better checking on the movements over the bank account
Showing debug toolbar
Updated frontend libraries
Moving the glyphicons
Improving header links
Fixing indent
Added accounts application, which manage user registration, login and logout
Ignoring .coverage file
Making email mandatory for user registration
Using Django Nose as test runner, and including coverage reports
Tests about user registration and login
Using Django messages for showing stuff
Replacing mysql_escape_string with mysql_real_escape_string in installer.

mysql_escape_string is deprecated and throws and error in E_STRICT:

http://php.net/manual/en/function.mysql-escape-string.php
Creating some objects in the installer that were left out.

This was throwing installer errors in E_STRICT mode.
_check_ext() now allows the field name to be set to something other than userfile
French translations
French translations
Merge pull request #1330 from khalil-tabbal/2.1/develop

2.1/develop
Page Layout Events addition

Added 3 new events for Page Layouts: page_layout_created,
page_layout_updated, page_layout_deleted
Bug Fix: Page Layout flashdata not showing number

The Page Layout flashdata message was not showing the page_id correctly
for single and multiple items.
Redirects Events added

Added three new Events to Redirects: redirect_created,
redirect_updated, redirect_deleted.
Merge pull request #1854 from chadwithuhc/enhancement/event-additions

Enhancement/event additions
added a route
added index.html.erb and stylings
Study DS Exp 5.2
reorganized, using pure jQuery
You should able to go out of Sorfina's house now.
[BUG #7052] Make sure 0 (and only 0) will be accepted as value when the input field is set to required.
Minor manual change.
Added unit test for svg fix
Adjust minimum widths so they actually work at 80x25 without glitching out
Merge branch 'master' of github.com:quietust/dfhack into 40d
jquery 1.7.2 is not in static
retour de .gitignore pour ce depot...
Merge branch 'master' of github.com:quinode/djaloha

Conflicts:
	.gitignore
	djaloha/widgets.py
Added missing getter/setter for outputFormat.
Package name updated in examples
Avoiding mouse to select numbers
modified:   README.md
	new file:   libs/jargs.jar
removed load-theme
removed manifest version
Replacing FacebookRequest with the crossplatform RCHttp
Correction bug d'inventaire, vie et fin a la sortie de la partie !

Signed-off-by: ralmn <ranger_tigre@hotmail.fr>
A little more instruction for Linux/OSX
Updating composer.json to include Lumbendil's changes:

See Lumbendil's commit here:
https://github.com/Lumbendil/phactory/commit/e205088762e060770a1bc072bd25f6de67970398
Add tests for schema manipulation by an other process
Merge pull request #5 from ryoqun/concurrent-schema-manipulation

Add tests for schema manipulation by an other process

Patch by Ryo Onodera. Thanks!!!
doc: fix the markup of the document for Groonga::PatriciaTrie.create

refs #1485

Before:
 call-seq:
   Groonga::PatriciaTrie.create(options={}) -> Groonga::PatriciaTrie
   Groonga::PatriciaTrie.create(options={}) {|table| ... }

 ...
 @param ...
 @option ...
 ...
 @example
   ...

After:
 ...
 @example
   ...
 @overload create(options={})
   @return [Groonga::PatriciaTrie]
   @param ...
   @option ...
   ...
 @overload create(options={})
   @yield [table]
   @param ...
   @option ...
   ...
test: use setup_tables and setup_data
Recurse und Param aus Meune entfernt
Menue korrigiert
Add all tex files to Makefile.
Spell check.
Postalizzazione 5
Use integer enumerators for clue types
Combine CAT type handline with other functions
Formatting, doc updates, minor code alterations
[Stream]

Documented why new `StreamInterface` exists
Moved MO docs to wiki

Overview, testing, and API pages now found here:
https://github.com/readium/readium/wiki
Moved MO docs to wiki
transfertData_XL_Mongo.php fixed and add few feeds.
instanceof Model
add_to, set_to, del_from
add rspec snip
fix disordered use of long sound in Japanese "user" translation (#11411)

Contributed by Kenichi Maehashi.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10019 e93f8b46-1217-0410-a6f0-8f06a7374b81
Bulgarian translation (jstoolbar) updated by Ivan Cenov (#10785)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9543 e93f8b46-1217-0410-a6f0-8f06a7374b81
Removed /vendor/plugins directory. Redmine plugins should be dropped in /plugins now.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9565 e93f8b46-1217-0410-a6f0-8f06a7374b81
Dutch "field_password_confirmation" translation changed by Siebe Joris Jochems (#10513)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9248 e93f8b46-1217-0410-a6f0-8f06a7374b81
added  motion blur  interpolation to partioInstancer   for  rotation and  scale.
Finance Production Payable
Use port 443 for prod
WIP Validate dna.json before preparing for converge
mise à jour massive
Added mezzanine-blocks to README.rst.
Update the README
Update the installation instructions
Build man pages for distribution
Build a PDF of docs and include it in source tarballs.
Explicitly link hyperdex-daemon against cityhash.
Correctly detect BusyBee with pkgconfig.
Distribute Node.JS in tarballs.
Link hyperdex-daemon with -lpthread.
Added a provisonal copyright notice for github user riotopsys, extracted from the git log.
Adapting the script to implement a lot of themes

Add Theme Moonify
Don't say -h is invalid whereas it is supported.

getopt_long(3) was reporting "ninja: invalid option -- h" when "ninja -h" was
called.

Regression most probably introduced by 5fdb12ed5cec4e1c853c64026142d088ff5519e1
Merge pull request #433 from polrop/fix-help-option

Don't say -h is invalid whereas it is supported.
Criação Controller e Form RBC
Testing for triad.h. Completed most testing except for GetNodeTriads and GetLen2Paths pending questions. Makefile only has for test-triad for quick test verifications.
meter.py
added reset to meter
Merge branch 'master' of https://github.com/richzeng/yunomi
networkmanager: Propagate udev rules.

This made my 3G modem being properly discovered by NetworkManager.
Bug 731813 - Do not attempt to serialize SVG attributes for mutation events if they do not exist. r=jwatt,bzbarsky

--HG--
extra : rebase_source : 6af188d032bdcd28a19b2da0f46e185cfd52b20d
Merge m-c to s-c.
Bug 722273 - [New Tab Page] clear internal links cache on 'browser:purge-session-history'; r=dietrich
Bug 733237 - Make test HTTP sync server behave more properly; r=rnewman
Bug 732744 - rm AutoPreserveEnumerators (r=dvander)

--HG--
extra : rebase_source : f28eebcf3a3e14f4db0299b07b28f8e7a783b84a
Bug 733310 - factor out inc/dec interpreter logic (r=bhackett)

--HG--
extra : rebase_source : 10d8277f4446f97e9a158f740d1a398341ac2382
Merge m-c into s-c
Merge s-c (empty merge due to bad head on s-c)
Bug 732605 - Only schedule shorter sync interval if records were successfully applied; r=rnewman, r=mconnor
Back out 5026c5ad25e7 because of XUL Fennec bustage
Bug 708161 - POST data for search engine submissions. r=mfinkle
Bug 733285 - Add bluetooth default option and change ril option locations in configure.in; r=mwu
Bug 734053 - Add-ons are not listed in Add-ons Manager. r=mbrubeck
Bug 705594. Update Unicode range and pref font lists to avoid system fallback. r=roc
Bug 705594. Add cmapdata logging. r=roc
Bug 705594. Implement hard-coded font fallback. r=roc
Bug 705594. Fixup of intra-family fallback code. r=jfkthame
Bug 705594. Add pref to force global cmap-based font fallback. r=roc
Bug 705594. Use CoreText for system font fallback on OSX. r=jfkthame
Bug 705594. Use DirectWrite custom text renderer for fallback on Windows Vista/7. r=bas
updated libraries and adapted to library changes
first three tables inserted
Created base iOS project files.
novy config template
Arrays use unamed fields, require non-standard (C11) extension.
Add simple .less->.css filter.
Add markdownsharp's version number for future reference
#799
removed an URI test that had no host host part
mmme
stage0 busybox: add some more checks
bump musl to 0.9.2
fix the damn header for the last time
DataObjects/Core_enum.php
DataObjects/Person.php
Pman.Dialog.CoreNotifyRecur.bjs
DataObjects/Core_watch.php
Updated root android project
Add a IOImageHelper for read the pixel type of a unknown image
Modify btkCropImageUsingMask for using IOImageHelper, now it write
output image with the same pixel type as input image
fix mpris.c for seeking through progress bar
made the output just display hex, and made an led blink when a card is read
Merge branch 'master' of github.com:rpiEHC/RPI-RFID
commit pelo ubuntu
ubuntu: removed some warnings
find and replace in selection
exclude fenced and inline code regions from mathjax pre-processing
Yard documentation updates.
Update Assembly and README. [admin]
ChangePassword (GUI part)
acomment
Merge branch 'master' of github.com:runn1ng/FilmTit

Conflicts:
	src/gui/src/main/java/cz/filmtit/client/Gui.java
	src/gui/src/main/java/cz/filmtit/client/PageHandler.java
	src/userspace/src/main/java/cz/filmtit/userspace/FilmTitBackendServer.java

ACTUALLY THESE COULD BE MERGED AUTOMATICALLY VERY EASILY, BUT GIT DECIDED NOT TO...
Handling the active documents added to session termination.
Stub of general introduction and description of User Space classes added to documentation.
checking time when changing it
Merge branch 'master' of github.com:runn1ng/FilmTit
Merge branch 'master' of github.com:runn1ng/FilmTit
add serveral options
change method sig; remove never called method from Drawable
fix regression
add debug output
smart ptr
introduce Molecule handling in Paste(); guards
add cpy constructor from ptr
clarify which null
Fix fb:admins/fb:app_id meta tags.
Fix issue with finding/replacing the page title. Comment buffer functions.
Thread: Added container tests

git-svn-id: http://svn.boost.org/svn/boost/trunk@77887 b8fc166d-592f-0410-95f2-cb63ce0dd405
Thread: Set examples exmplcit

git-svn-id: http://svn.boost.org/svn/boost/trunk@77888 b8fc166d-592f-0410-95f2-cb63ce0dd405
Thread: try to fix some issues with packaged_task with signature parameters

git-svn-id: http://svn.boost.org/svn/boost/trunk@80783 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78892 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78893 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78894 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78895 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78896 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78897 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78898 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78899 b8fc166d-592f-0410-95f2-cb63ce0dd405
Change to all lower case so works on *nix and windows

git-svn-id: http://svn.boost.org/svn/boost/trunk@78900 b8fc166d-592f-0410-95f2-cb63ce0dd405
fixes for linaro compiler
removed suffix at end of layout
멤버 페이지링크 수정
Merge branch 'master' of https://github.com/saegeul/saegeul.git
Added scalar conversions
Merge pull request #34 from jaytaph/object

Added scalar conversions
Added casting info
Merge pull request #35 from jaytaph/master

Added casting info
removed timer debugging polluting the logs ( introduced with the previous dlg enhancements )
Fb connect :)
py-markupsafe: reformat, add modeline, update homepage, add py3x subports


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99515 d073be05-634f-4543-b044-5fe20cf6d1d6
py-mako: update to version 0.7.3


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99516 d073be05-634f-4543-b044-5fe20cf6d1d6
py-beaker: restore py24 variant


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99517 d073be05-634f-4543-b044-5fe20cf6d1d6
nds2-client: made aronnax primary maintianer, ram second maintainer; added variants for two authentication methods


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95022 d073be05-634f-4543-b044-5fe20cf6d1d6
py*-pyglet: unify


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100444 d073be05-634f-4543-b044-5fe20cf6d1d6
python/py-sympy:
  add python33 support


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100445 d073be05-634f-4543-b044-5fe20cf6d1d6
editors/vim:
Add new variant +python33 to support the python33 port.
Thanks to g5pw@ for the patch.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100446 d073be05-634f-4543-b044-5fe20cf6d1d6
mapnik: small adjustments


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98386 d073be05-634f-4543-b044-5fe20cf6d1d6
added try/fail support
update NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  update NEWS
5.4.11-dev
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.11-dev

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.11-dev
Added template for pages with no titles.
Added page titles, and removed the "sleep" on login failures. Will replace it shortly with something else that's non-blocking (or at least not quite so easy as a DOS vector)
add core header to CMakeLists.txt.
adjust core/*/src code format(2-space indent).
BUG: Fixed minor issues with screenshot based testing

Added support for list of test scripts given to macro slicer_add_qttest
Slicer was closing prematurely as superclass method was called before
derived class method. (HandleCommandLineArguments)
Using qMRMLUtils method for converting from qImage to vtkImageData.
ENH: Enhanced the slicer testing architecture

Examples on use of the new testing macro and added new baseline images
for existing QtTesting tests.
Addresses issue 2567.
BUG: Transparency issues with vtkTesting and macro cleanup

Transparency is not supported by vtkImageDifference and hence when
vtkTesting does image comparison based on screenshots taken using
ctkScreenshotDialog, there can be errors in the regression test.
Cleaned up macros and renamed test-script option to xml-test-script.
Addresses issue 2567
ENH: Ability to fetch baseline images from Midas

Updated the slicer_add_qttest macro to use ExternalData.cmake to fetch
baseline images from Midas given an md5 checksum. The macro uses the
DATA{} syntax from ExternalData.cmake to refer to the content-link. The
DATA{} syntax expects a BaselineImage.png.md5 at the BASELINE_DIR
location to fetch the correct BaselineImage.png from Midas.
Addresses issue 2567
Changes according to CTK changes
2 1336508328 2012-05-08 22:18:46+02:00
added r/w test for builtins and struct of builtins
node 0.8.15

Closes #16315.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
whirr 0.8.1

Closes #16319.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
vim 7.3.744

Closes #16321.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
nmap 6.25

Closes #16323.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
brew cleanup: don't remove higher version kegs.

* Use version compare to only remove kegs with lower version than the
  current one, not higher version which might be from someone's
  branch.
* Do the same for cache cleanup.
  - Be conservative so that if a name detected from cache file is not
    the same as its formula then don't clean it.

Closes #15914.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
pari: doesn't depend on X11.

References #15293.
redis: fixed redis.conf rename false positive.

Closes #16239.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
darner: add launchd and cleanup.

Closes #16240.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Merge branch 'master' of http://github.com/mxcl/homebrew
updated file to read ERF and erf
Fixed possible issue with output filename. Thx @shederman for reporting this!
Old command will still be shown.
Typo.
Added shouldBeSkipped notion to sources; Posts now have drafts. closes #59
BUILD: Add COPYING.BSD to Windows installer script.
KYRA: Mark Kyra 1 russian floppy version as fan translation.
SWORD1: Fix crash in demo when using French subtitles
SWORD1: Use _missingSubTitleStr when asking for an out of bound textId

It was using textId 0, which is not the subtitle we want anyway. So
instead of using the wrong subtitle, it is probably better to not display
a subtitle at all. A test case for this is with the demo when using
non-english language as several subtitles are missing toward the end.
WINTERMUTE: Use ascii for detecting printable-characters instead of Keycode.
PEGASUS: Ease off the CPU in the overview
PEGASUS: Improve on the WSC missing AI videos bug

Made the only hint available into the first hint
Don't check for existing watch when setting up watches

This check had prohibitive cost and was useless to some extent
because adding a watch for an already watched path will result
in assigning the same watch descriptor therefore only updating
it. There won't be any dangling watch descriptor left into the
watch manager dictionary.

Issue reported by Jan Knudsen https://github.com/Shne
(failed) attempt to fix missing genes
package sample data
tried to fix
k means updated for bash paste
20121122_rc07
Merge branch 'master' of github.com:secretariat/dtg
vimrc set gui options
updated class diagrams
Merge branch 'master' of https://github.com/seps12/CameRace

Conflicts:
	Dokumente/Schlussbericht/Klassendiagramm/class_diagram.png
	Dokumente/Schlussbericht/Klassendiagramm/editor_ui.png
	Dokumente/Schlussbericht/Klassendiagramm/race_ui.png
	Dokumente/Schlussbericht/Klassendiagramm/rest_ui.png
Merge branch 'master' of https://github.com/seps12/CameRace
* .iws repair
swiched to using svg for all graphics
fixed to ls function correctly on Mac OS X